fix build script since it did no longer build
Former-commit-id: 3a045493a26f7256c32c43a13cc59b0f680dfb80
This commit is contained in:
parent
c04ca7a926
commit
f3bf9d716d
2 changed files with 16 additions and 17 deletions
|
|
@ -77,14 +77,6 @@
|
|||
|
||||
<target name="build-dependencies">
|
||||
<mkdir dir="${buildDir}" />
|
||||
<javac srcdir="${libDir}/java-speech-api-master/src" destdir="${buildDir}" fork="yes">
|
||||
<include name="**/*.java" />
|
||||
<classpath refid="classpath.build" />
|
||||
</javac>
|
||||
<javac srcdir="${libDir}/sphinx4-5prealpha-src/sphinx4-core/src/main/java" destdir="${buildDir}" fork="yes" encoding="UTF-8">
|
||||
<include name="**/*.java" />
|
||||
<classpath refid="classpath.build" />
|
||||
</javac>
|
||||
<get src="http://repo.koc.se/zutil-java.git/blob/master/Zutil.jar" dest="${libDir}" verbose="true" usetimestamp="true"/>
|
||||
</target>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,21 +21,28 @@
|
|||
$(function(){
|
||||
chartData("min-power-chart",
|
||||
[
|
||||
{{#minData}}
|
||||
{ y: (Date.now()-24*60*60*1000) },
|
||||
{{#minData}}
|
||||
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
|
||||
{{/minData}}
|
||||
{ y: Date.now() },
|
||||
{ y: Date.now() }
|
||||
]
|
||||
);
|
||||
chartData("hour-power-chart",
|
||||
[{{#hourData}}
|
||||
[
|
||||
{ y: (Date.now()-3*24*60*60*1000) },
|
||||
{{#hourData}}
|
||||
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
|
||||
{{/hourData}}]
|
||||
{{/hourData}}
|
||||
{ y: (Date.now()-24*60*60*1000) }
|
||||
]
|
||||
);
|
||||
chartData("day-power-chart",
|
||||
[{{#dayData}}
|
||||
{ y: {{.timestamp}}, {{.username}}: {{.data}} },
|
||||
{{/dayData}}]
|
||||
{{/dayData}}
|
||||
{ y: (Date.now()-3*24*60*60*1000) }
|
||||
]
|
||||
);
|
||||
});
|
||||
var userArray = [ {{#username}} '{{.}}', {{/username}} ];
|
||||
|
|
@ -47,7 +54,7 @@
|
|||
ykeys: userArray,
|
||||
labels: userArray,
|
||||
continuousLine: false,
|
||||
pointSize: 0,
|
||||
pointSize: 1,
|
||||
postUnits: 'kWh',
|
||||
resize: true
|
||||
});
|
||||
|
|
@ -85,15 +92,15 @@
|
|||
<h1 class="page-header">Overview</h1>
|
||||
|
||||
<div class="row placeholders">
|
||||
<H1>Last 24 hours</H1>
|
||||
<H1>Last 24 hours (kWh/5min)</H1>
|
||||
<div id="min-power-chart" style="height:450px;"></div>
|
||||
</div>
|
||||
<div class="row placeholders">
|
||||
<H1>Previous two days</H1>
|
||||
<H1>Previous two days (kWh/h)</H1>
|
||||
<div id="hour-power-chart" style="height:450px;"></div>
|
||||
</div>
|
||||
<div class="row placeholders">
|
||||
<H1>Long term</H1>
|
||||
<H1>Long term (kWh/day)</H1>
|
||||
<div id="day-power-chart" style="height:450px;"></div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue