Chrysostomos for scheduler

[myslice.git] / plugins / scheduler2 / templates / scheduler.html

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index f5faba9..d7cd16e 100755 (executable)
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -16,6 +16,7 @@
             <span class="glyphicon glyphicon-calendar"></span>\r
         </div>\r
         <div class="col-md-2 text-center">\r
+            {% comment %}\r
             <div id="TopologyModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">\r
                 <div class="modal-dialog">\r
                     <div class="modal-header">\r
@@ -28,6 +29,8 @@
                 </div><!-- /.modal-dialog -->\r
             </div><!-- /.modal TopologyModal -->\r
             <button type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#TopologyModal">Topology</button>\r
+            {% endcomment  %}\r
+            <button id="btnSchedulerSubmit" type="button" class="btn btn-primary btn-md">Submit Leases</button>\r
 \r
         </div>\r
     </div>\r
@@ -51,7 +54,7 @@
                 <thead>\r
                     <tr>\r
                         <th>#</th>\r
-                        <th ng-repeat="slot in slots" >\r
+                        <th ng-repeat="slot in slots">\r
                             {[{ slot.time }]}\r
                         </th>\r
                     </tr>\r
@@ -59,7 +62,7 @@
                 <tbody>\r
                     <tr ng-repeat="resource in resources" ng-class-odd="''" ng-class-even="'even'">\r
                         <th data-resourceid="{[{ resource.id }]}" data-rowindex="{[{ $index }]}" data-resourceindex="{[{ resource.index }]}" style="word-wrap: break-word; word-break: break-all; ">{[{ resource.name }]}</th>\r
-                        <td ng-repeat="lease in resource.leases" data-slotid="{[{ lease.id }]}" ng-class="{{ 'lease.status' }}"></td>\r
+                        <td ng-repeat="lease in resource.leases" data-slotid="{[{ lease.id }]}" data-groupid="{[{ lease.groupid }]}" ng-class="{{ 'lease.status' }}"></td>\r
                     </tr>\r
                 </tbody>\r
             </table>\r
@@ -79,48 +82,48 @@
                     </div>\r
                 </div>\r
             </div>\r
-        {% comment %}\r
-        <div id="reservation-table-scroll-container">\r
-            <table id='{{domid}}-reservation-table' class='table table-bordered'>\r
-                <thead>\r
-                    <tr>\r
-                        {% for ts in time_slots %}\r
-                        <th class='center info'>{{ ts|safe }}</th>\r
-                        {% endfor %}\r
-                    </tr>\r
-                </thead>\r
-                <tbody>\r
+            {% comment %}\r
+            <div id="reservation-table-scroll-container">\r
+                <table id='{{domid}}-reservation-table' class='table table-bordered'>\r
+                    <thead>\r
+                        <tr>\r
+                            {% for ts in time_slots %}\r
+                            <th class='center info'>{{ ts|safe }}</th>\r
+                            {% endfor %}\r
+                        </tr>\r
+                    </thead>\r
+                    <tbody>\r
 \r
-                    {% for itms in nodes %}\r
-                    {% for n in itms.1 %}\r
-                    <tr data-trindex="">\r
-                        {% for ts in time_slots %}\r
-                        {% if n == 'node020' %}\r
-                        <td class="maintenance closed" data-tdindex="{{forloop.counter}}"></td>\r
-                        {% elif n == 'node023' or n == 'node030' %}\r
-                        <td class="closed" data-tdindex="{{forloop.counter}}"></td>\r
-                        {% else %}\r
-                        <td class="" data-tdindex="{{forloop.counter}}"></td>\r
-                        {% endif %}\r
+                        {% for itms in nodes %}\r
+                        {% for n in itms.1 %}\r
+                        <tr data-trindex="">\r
+                            {% for ts in time_slots %}\r
+                            {% if n == 'node020' %}\r
+                            <td class="maintenance closed" data-tdindex="{{forloop.counter}}"></td>\r
+                            {% elif n == 'node023' or n == 'node030' %}\r
+                            <td class="closed" data-tdindex="{{forloop.counter}}"></td>\r
+                            {% else %}\r
+                            <td class="" data-tdindex="{{forloop.counter}}"></td>\r
+                            {% endif %}\r
+                            {% endfor %}\r
+                        </tr>\r
                         {% endfor %}\r
-                    </tr>\r
-                    {% endfor %}\r
-                    {% endfor %}\r
-                </tbody>\r
-            </table>\r
-        </div>\r
-        {% endcomment  %}\r
+                        {% endfor %}\r
+                    </tbody>\r
+                </table>\r
+            </div>\r
+            {% endcomment  %}\r
 \r
-        <div class="legend">\r
-            <ol>\r
-                <li class="free">free</li>\r
-                <li class="selected">selected</li>\r
-                <li class="closed">reserved</li>\r
-                <li class="maintenance">maintenance</li>\r
-            </ol>\r
-        </div>\r
-    </div><!-- / scheduler plugin -->\r
-    <script type="text/javascript">\r
-        //alert("1");\r
-    </script>\r
-</div>
\ No newline at end of file
+            <div class="legend">\r
+                <ol>\r
+                    <li class="free">free</li>\r
+                    <li class="selected">selected</li>\r
+                    <li class="closed">reserved</li>\r
+                    <li class="maintenance">maintenance</li>\r
+                </ol>\r
+            </div>\r
+        </div><!-- / scheduler plugin -->\r
+        <script type="text/javascript">\r
+            //alert("1");\r
+        </script>\r
+    </div>\r