diff --git a/cydiapomonella/templates/cydiapomonella/index.html b/cydiapomonella/templates/cydiapomonella/index.html
index 36e4c7a882d0c882b10b0cf648238657158faa5f..8347f9acc6e161dbfbe5ad7c393ca2f2cc80aa22 100644
--- a/cydiapomonella/templates/cydiapomonella/index.html
+++ b/cydiapomonella/templates/cydiapomonella/index.html
@@ -76,7 +76,6 @@
}
var startDate = new Date($('#idTxtDateInput').val());
- console.log('date picker start date : '+JSON.stringify(startDate));
var strStartDate = JSON.stringify(getAdjustDate(new Date($('#idTxtDateInput').val()), 1 )).substring(1,11);
@@ -140,8 +139,6 @@
/*Calling function to calculate and place heatsum value based upon date placed on datepicker*/
funDtPickerHeatSum();
-
-
});
@@ -154,7 +151,6 @@
/* Convert hourly data to daily data */
function setConvertHourlyData(data)
{
- //var TM_BASE = 10;
var resultConvertData=[];
var strDate01 = '';
@@ -167,13 +163,6 @@
var time22 = '';
var time23 = '';
var rainFall = 0.0;
-
- //var TM_NON_NEGATIVE = 0;
-
- //var TM_Daily = 0.0;
- //var TM_SUM = 0.0;
- //var TM_Calc = 0.0;
-
var hourCount = 0;
var tempval = '';
@@ -266,7 +255,7 @@
}
getWeatherDataTable(resultConvertData);
- console.log (" resultConvertData : "+JSON.stringify(resultConvertData));
+
}
@@ -288,17 +277,14 @@
var TM_Calc = 0.0;
var TM_NON_NEGATIVE = 0;
- console.log('daily data 02 : '+JSON.stringify(data));
-
- console.log ('time measured 0 : '+data[0].timeMeasured);
var counter = undefined;
+
for (var i=0; i<data.length; i++)
{
var strStartDateDtPicker = JSON.stringify(getStrConvertedDate(data[i].timeMeasured)).substring(1,11);
- console.log ('strStartDateDtPicker : '+strStartDateDtPicker);
+
if(strStartDateDtPicker===$('#idTxtDateInput').val())
{
- console.log('value of I : '+i);
counter = 0;
}
if(typeof counter === "undefined")
@@ -311,18 +297,16 @@
TM_Calc = TM_Daily - TM_BASE;
TM_NON_NEGATIVE = TM_NON_NEGATIVE + ((TM_Calc<0) ? 0 : TM_Calc);
var temp = ((TM_Calc<0) ? 0 : TM_Calc)
- console.log('time measured :'+data[counter].timeMeasured+' -- TM_Daily : '+TM_Daily+'-- TM_NON_NEGATIVE : '+temp);
++counter;
}
-
-
-
-
}
- console.log('non negative : '+TM_NON_NEGATIVE);
+
+ $('#idSpanWeatherStationName').html($('#weatherStationId').find(':selected').text());
$('#idSpanStartDate').html($('#idTxtDateInput').val());
$('#idSpanEndDate').html(JSON.stringify(dateYesterday).substring(1,11));
$('#idDivResultNonNegative').html(Math.round(TM_NON_NEGATIVE));
+ $('#idSpanDateDifference').html(dateDifferenceInDays(new Date($('#idTxtDateInput').val()), new Date()));
+
}
@@ -332,7 +316,8 @@
if($.trim(weatherData))
{
$('#idTableWeather').DataTable({
-
+ "sDom": '<t><"col-sm-5"i><"clearfix">',
+ "lengthMenu": [[50, -1], ["All"]],
"aaData" : weatherData,
"aoColumns" :
[
@@ -348,42 +333,49 @@
"render" :function(data, type, full, meta)
{
return data
- }
+ },
+ "bSortable" : false
+
},
{
"mData" : "time20",
"render" :function(data, type, full, meta)
{
return data
- }
+ },
+ "bSortable" : false
},
{
"mData" : "time21",
"render" :function(data, type, full, meta)
{
return data
- }
+ },
+ "bSortable" : false
},
{
"mData" : "time22",
"render" :function(data, type, full, meta)
{
return data
- }
+ },
+ "bSortable" : false
},
{
"mData" : "time23",
"render" :function(data, type, full, meta)
{
return data
- }
+ },
+ "bSortable" : false
} ,
{
"mData" : "rainFall",
"render" :function(data, type, full, meta)
{
return data
- }
+ },
+ "bSortable" : false
}
],
destroy: true
@@ -453,7 +445,6 @@
resultData = data;
getHeatSumValue(resultData);
- console.log('daily data 01 : '+JSON.stringify(resultData));
}
else{
//TODO
@@ -481,10 +472,18 @@
/* Converted date as per TimeZone */
function getStrConvertedDate(existingDate)
{
- //console.log('converted date : '+moment.tz(existingDate,CONST_TIMEZONE).format('YYYY-MM-DD HH:mm')+'original date : '+existingDate);
return moment.tz(existingDate,CONST_TIMEZONE).format('YYYY-MM-DD HH:mm');
}
+ /* Date difference */
+ function dateDifferenceInDays(startDate, endDate)
+ {
+ var strEndDate = JSON.stringify(endDate).substring(1,11);
+ var dtEndDate = new Date(strEndDate);
+ var result = (dtEndDate - startDate)/(1000*60*60*24);
+ return result;
+ }
+
</script>
{% endblock %}
@@ -501,7 +500,7 @@
<div class="container-fluid">
<div class="row ">
<div class="col-sm-4">
- <select name="weatherStationName" id="weatherStationId">
+ <select name="weatherStationName" id="weatherStationId" class="form-control">
<option value="-1">-- Velg klimastasjon --</option>
<option value="11">Apelsvoll</option>
<option value="12">Balestrand</option>
@@ -572,13 +571,13 @@
<div class="form-group form-inline">
<label for="nameTxtDateInput">Calculate heat sum from Date:</label>
- <input id="idTxtDateInput" name="nameTxtDateInput" class="notranslate" readonly/>
+ <input id="idTxtDateInput" name="nameTxtDateInput" class="notranslate form-control" readonly/>
</div>
<!-- button type="submit" class="btn btn-default">Submit</button -->
</form>
</div>
<div class="row alert alert-warning">
- Varmesum, med basistemperatur 10, beregnet for Bø klimastasjon for perioden fra og med <span id="idSpanStartDate">-</span> til <span id="idSpanEndDate">--</span> ( 7 dager ) er : <span class="label label-primary" id="idDivResultNonNegative"></span> graddager
+ Varmesum, med basistemperatur 10, beregnet for <span id='idSpanWeatherStationName'>-</span> klimastasjon for perioden fra og med <span id="idSpanStartDate">-</span> til <span id="idSpanEndDate">--</span> ( <span id="idSpanDateDifference">-</span> dager ) er : <span class="label label-primary" id="idDivResultNonNegative"></span> graddager
</div>
</div>