Merge branch 'eplevikler' into epleviklerNewFeatures

cydiapomonella/templates/cydiapomonella/index.html

@@ -46,10 +46,31 @@
 {% endblock %}
 {% block customCSS %}
     <style>
+        /* Over ride datatable property to maintain default color */
         .navbar-default {
             background-color: #fff;
             border-color:#fff;
         }
+        
+        /* Text align center - used in datatable */
+        .colCenter {text-align: center;}
+
+        /* Data table odd stripe color */
+        .table-striped>tbody>tr:nth-child(odd)>td,
+        .table-striped>tbody>tr:nth-child(odd)>th {
+            background-color: #ebf1d4 /* Choose your own color here */
+        }
+ 
+        /* Data table even stripe color */
+        .table-striped>tbody>tr:nth-child(even)>td,
+        .table-striped>tbody>tr:nth-child(even)>th {
+        background-color: #e4ddd6 /* Choose your own color here */
+        }
+
+        body {
+            font-family: 'Source Sans Pro', sans-serif;
+        }
+        
     </style>
 {% endblock %}
 {% block customJS %}
@@ -487,57 +508,66 @@
                                             "render"    :   function(data, type, full, meta)
                                                             {
                                                                 return data
-                                                            }
+                                                            },
+                                            "sClass" :  "colCenter",
+                                            "bSortable" : false
                                         },
                                         {
-                                            "mData"     :   "time19",
-                                            "render"    :   function(data, type, full, meta)
-                                                            {
-                                                                return data
-                                                            },
+                                            "mData" : "time19",
+                                            "render" :function(data, type, full, meta)
+                                                        {
+                                                            return data
+                                                        },
+                                            "sClass" :  "colCenter",
                                             "bSortable" : false
 
                                         },
                                         {
-                                            "mData"     :   "time20",
-                                            "render"    :   function(data, type, full, meta)
-                                                            {
-                                                                return data
-                                                            },
+                                            "mData" : "time20",
+                                            "render" :function(data, type, full, meta)
+                                                        {
+                                                            return data
+                                                        },
+                                            "sClass" :  "colCenter",                                                        
                                             "bSortable" : false
                                         },
+                                         
                                         {
-                                            "mData"     :   "time21",
-                                            "render"    :   function(data, type, full, meta)
-                                                            {
-                                                                return data
-                                                            },
+                                            "mData" : "time21",
+                                            "render" :function(data, type, full, meta)
+                                                        {
+                                                            return data
+                                                        },
+                                            "sClass" :  "colCenter",                                                        
                                             "bSortable" : false
                                         },
-                                        {
-                                            "mData"     :   "time22",
-                                            "render"    :   function(data, type, full, meta)
-                                                            {
-                                                                return data
-                                                            },
+ {
+                                            "mData" : "time22",
+                                            "render" :function(data, type, full, meta)
+                                                        {
+                                                            return data
+                                                        },
+                                            "sClass" :  "colCenter",
                                             "bSortable" : false
                                         },
                                         {
-                                            "mData"     :   "time23",
-                                            "render"    :   function(data, type, full, meta)
-                                                            {
-                                                                return data
-                                                            },
+                                            "mData" : "time23",
+                                            "render" :function(data, type, full, meta)
+                                                        {
+                                                            return data
+                                                        },
+                                            "sClass" :  "colCenter",                                                        
                                             "bSortable" : false
                                         } ,
                                         {
-                                            "mData"     :   "rainFall",
-                                            "render"    :   function(data, type, full, meta)
-                                                            {
-                                                                 return data
-                                                            },
+                                            "mData" : "rainFall",
+                                            "render" :function(data, type, full, meta)
+                                                        {
+                                                            return data
+                                                        },
+                                            "sClass" :  "colCenter",                                                        
                                             "bSortable" : false
-                                        }                                                          
+                                        }                                                
                                     ], 
                                     destroy             : true
                                 });
@@ -551,6 +581,8 @@
     }
     
 
+    
+
     /* Fetch hourly data through ajax call */
     function getAjaxHourlyData(jsonParamUrlDataHourly,idJsonParam, flagActivate)
     {
@@ -577,9 +609,10 @@
                                 $('#idTableWeather').show();
                                 $('#idDivHeatSum').show();
 
-                                resultData                  =   data;
+                                $('#divIdErrorWeatherStation').hide();
+                                resultData  =   data;
                                 setConvertHourlyData(resultData, flagActivate);
-                                
+
                                 if($.trim(idJsonParam.pas))
                                 {
                                     
@@ -591,9 +624,12 @@
                                     funDtPickerHeatSum();
                                 }
 
+                                
                             }
                             else{
                                 $('#idDivHeatSum').hide();
+                                $('#divIdErrorWeatherStation').show();
+                                $('#idTableWeather').hide();
                             }
                         },
                         error : function(xhr, status, error)
@@ -674,9 +710,13 @@
 <div class="col-md-12" >
     <h1>{% trans "Calculate the risk of attack by the coddling moth" %}</h1>
 </div>
-
-
-<div class="container-fluid">
+<div class="clearfix"></div>
+    <div class="container-fluid">
+    <div class="row">
+        <div class="col-sm-10">
+            <div id='divIdErrorWeatherStation' class="alert alert-danger .alert-dismissable" style="display: none;" ><span class=".glyphicon .glyphicon-minus-sign"></span> No records available from selected weather station !!</div>
+        </div>
+    </div>
     <div class="row ">
         <div class="col-sm-4">
             <select name="weatherStationName" id="weatherStationId" class="form-control">
@@ -747,16 +787,17 @@
 
 <div class="container-fluid" id="idDivHeatSum" style="display: none;">
     <div class="row ">
-        <label class="control-label">{% trans "Heat sum" %}</label>
+        <h3>{% trans "Heat sum" %}</h3>
         <form class="form-inline">
             <div class="form-group form-inline">
 
                 <label for="nameTxtDateInput">{% trans "Calculate heat sum from date" %}:</label>
-                <input id="idTxtDateInput" name="nameTxtDateInput" class="form-control" type="date" placeholder="yyyy-mm-dd" onkeydown="return false" value="2020-01-01"/>
+                <input id="idTxtDateInput" name="nameTxtDateInput" class="form-control" type="date" placeholder="yyyy-mm-dd" onkeydown="return false" value="2020-01-01" style="line-height: inherit;"/>
             </div>
             <!-- button type="submit" class="btn btn-default">Submit</button -->
         </form>
     </div>
+    <div><br></div>
     <div class="row alert alert-warning">
     	{% trans "Heat sum, with a base temperature of 10 degrees Celcius, calculated for " %} <b><span id='idSpanWeatherStationName'>-</span></b>  {% trans "weather station for the period starting with" %}  <b><span id="idSpanStartDate">-</span></b> {% trans "and ending with" %} <b><span id="idSpanEndDate">--</span></b>  (<b><span id="idSpanDateDifference">-</span></b> {% trans "days" %}) {% trans "is" %} : <span class="label label-primary" id="idDivResultNonNegative"></span> {% trans "day degrees" %}
     </div>