UI: better management of sheet

1 files changed, 15 insertions, 6 deletions

diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index d385c986b..37d51cf70 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -38,6 +38,8 @@
         </button>
       </div>
       <div class="modal-body">
+          <div class="current-sheets"></div>
+          <div class="current-grid"></div>
       </div>
     </div>
   </div>
@@ -83,13 +85,16 @@
 <script type="text/javascript" language='javascript'>
 $('#modal_grid_{{name}}').on('show.bs.modal', function (e) {
     $('#grid_{{name}}_wrapper').appendTo(
-        '#modal_grid_{{name}} .modal-body');
+        '#modal_grid_{{name}} .modal-body .current-grid');
+    $('#window').appendTo(
+        '#modal_grid_{{name}} .modal-body .current-sheets');
     $('#grid_{{name}}').DataTable().clear().draw()
 });
 
 $('#modal_grid_{{name}}').on('hide.bs.modal', function (e) {
     $('#grid_{{name}}_wrapper').appendTo(
         '#grid_{{name}}_meta_wrapper');
+    $('#window').appendTo('#window_wrapper');
     $('#grid_{{name}}').DataTable().clear().draw()
 });
 
@@ -138,7 +143,7 @@ jQuery(document).ready(function(){
     }
     return false;
   });
-  jQuery("#grid_{{name}}").DataTable({
+  datatable_{{sname}} = jQuery("#grid_{{name}}").DataTable({
     "ajax": {
         "url": "{{source}}",
         "dataSrc": "rows"
@@ -250,9 +255,11 @@ jQuery(document).ready(function(){
 });
 
   function get_next_table_id(c_id){
-    var mygrid = jQuery("#grid_{{name}}");
+    // var mygrid = jQuery("#grid_{{name}}");
     var has_current_id = false;
-    ids = mygrid.getDataIDs();
+
+    ids = datatable_{{sname}}.column(0).data();
+    // ids = mygrid.getDataIDs();
     for (idx in ids){
         if (has_current_id) return ids[idx];
         if (ids[idx] == c_id) has_current_id = true;
@@ -260,9 +267,11 @@ jQuery(document).ready(function(){
     return false;
   }
   function get_previous_table_id(c_id){
-    var mygrid = jQuery("#grid_{{name}}");
+    // var mygrid = jQuery("#grid_{{name}}");
     var previous_id = 0;
-    ids = mygrid.getDataIDs();
+
+    ids = datatable_{{sname}}.column(0).data();
+    //ids = mygrid.getDataIDs();
     for (idx in ids){
         if (ids[idx] == c_id){
             if (previous_id) return previous_id;