From 0fdbc9ecf02d2154ba59f1f4a014bae3cee112e5 Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Mon, 2 Jul 2018 21:19:12 -0700
Subject: [PATCH] log viewer update to allow time frame use

---
 web/libs/js/main.dash2.js | 46 +++++++++++++++++++++++++++--------
 web/pages/blocks/logs.ejs | 51 ++++++++++++++++++++++++---------------
 2 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/web/libs/js/main.dash2.js b/web/libs/js/main.dash2.js
index 5c7d564e..5bfe73f4 100644
--- a/web/libs/js/main.dash2.js
+++ b/web/libs/js/main.dash2.js
@@ -2840,27 +2840,53 @@ $.pB.e.find('.stop').click(function(e){
 //    $.ccio.cx({f:'ffprobe',ff:'stop'})
 });
 //log viewer
-$.log={e:$('#logs_modal'),lm:$('#log_monitors')};$.log.o=$.log.e.find('table tbody');
+$.log = {
+    e : $('#logs_modal'),
+    lm : $('#log_monitors'),
+    dateRange : $('#logs_daterange')
+}
+$.log.dateRange.daterangepicker({
+    startDate:$.ccio.timeObject().subtract(moment.duration("5:00:00")),
+    endDate:$.ccio.timeObject().add(moment.duration("24:00:00")),
+    timePicker: true,
+    timePickerIncrement: 30,
+    locale: {
+        format: 'MM/DD/YYYY h:mm A'
+    }
+},function(start, end, label){
+    //change daterange
+    $.log.lm.change()
+});
+$.log.table = $.log.e.find('table')
 $.log.e.on('shown.bs.modal', function () {
     $.log.lm.find('option:not(.hard)').remove()
     $.each($.ccio.mon,function(n,v){
-        v.id=v.mid;
+        v.id = v.mid
         $.ccio.tm('option',v,'#log_monitors')
     })
     $.log.lm.change()
-});
-$.log.lm.change(function(e){
-    e.v=$(this).val();
-    if(e.v==='all'){e.v=''}
-    $.get($.ccio.init('location',$user)+$user.auth_token+'/logs/'+$user.ke+'/'+e.v,function(d){
+})
+$.log.lm.change(function(){
+    e = {}
+    e.v = $(this).val();
+    if(e.v === 'all'){
+        e.v=''
+    }
+    e.dateRange=$.log.dateRange.data('daterangepicker');
+    e.dateRange={startDate:e.dateRange.startDate,endDate:e.dateRange.endDate}
+    var url = $.ccio.init('location',$user)+$user.auth_token+'/logs/'+$user.ke+'/'+e.v+'?start='+$.ccio.init('th',e.dateRange.startDate)+'&end='+$.ccio.init('th',e.dateRange.endDate)
+    console.log(url)
+    $.get(url,function(d){
         e.tmp='';
         $.each(d,function(n,v){
-            e.tmp+='<tr class="search-row"><td title="'+v.time+'" class="livestamp"></td><td>'+v.time+'</td><td>'+v.name+'</td><td>'+v.mid+'</td><td>'+$.ccio.init('jsontoblock',v.info)+'</td></tr>'
+            
+            e.tmp+='<tr class="search-row"><td title="'+v.time+'" class="livestamp"></td><td>'+v.time+'</td><td>'+v.mid+'</td><td>'+$.ccio.init('jsontoblock',v.info)+'</td></tr>'
         })
-        $.log.o.html(e.tmp)
+        $.log.table.find('tbody').html(e.tmp)
+//        $.log.table.bootstrapTable()
         $.ccio.init('ls')
     })
-});
+})
 //multi monitor manager
 $.multimon={e:$('#multi_mon')};
 $.multimon.table=$.multimon.e.find('.tableData tbody');
diff --git a/web/pages/blocks/logs.ejs b/web/pages/blocks/logs.ejs
index c857709f..a135f7fd 100644
--- a/web/pages/blocks/logs.ejs
+++ b/web/pages/blocks/logs.ejs
@@ -8,25 +8,38 @@
         </button>
         <h4 class="modal-title" id="logsLabel"><i class="fa fa-exclamation-triangle"></i> &nbsp; <%-lang.Logs%></h4>
       </div>
-      <div class="modal-body">
-        <div class="form-group">
-            <label>
-                <div>
-                    <select class="form-control" id="log_monitors">
-                        <option class="hard" value="all"><%-lang['All Logs']%></option>
-                        <option class="hard" value="$USER"><%-lang['For Group']%></option>
-                    </select>
-                </div>
-            </label>
-        </div>
-        <div class="form-group">
-            <label>
-                <input class="form-control search-controller" placeholder="<%-lang.Search%>">
-            </label>
-        </div>
-        <table class="table table-striped">
-            <tbody class="search-body"></tbody>  
-        </table>
+      <div class="modal-body overflow-hidden">
+          <div class="col-md-3">
+            <div class="form-group">
+                <label>
+                    <div>
+                        <select class="form-control" id="log_monitors">
+                            <option class="hard" value="all"><%-lang['All Logs']%></option>
+                            <option class="hard" value="$USER"><%-lang['For Group']%></option>
+                        </select>
+                    </div>
+                </label>
+            </div>
+            <div class="form-group">
+                <label><div><span><%-lang.Search%></span></div>
+                    <div><input type="text" class="form-control search-controller" value="<%-lang.Search%>" /></div>
+                </label>
+            </div>
+            <div class="form-group">
+                <label><div><span><%-lang['Date Range']%></span></div>
+                    <div><input type="text" id="logs_daterange" class="form-control" value="" /></div>
+                </label>
+            </div>
+          </div>
+          <div class="col-md-9">
+          <div class="fixed-table-container">
+          <div class="fixed-table-body">
+            <table class="table table-striped">
+                <tbody class="search-body"></tbody>  
+            </table>
+          </div>
+          </div>
+          </div>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default pull-left" data-dismiss="modal"><i class="fa fa-times"></i> <%-lang.Close%></button>