From 56397243900b70af9a9350cbf9d270d13622643b Mon Sep 17 00:00:00 2001
From: "Chris.Watts90@outlook.com" <Chris.Watts90@outlook.com>
Date: Tue, 6 Mar 2018 11:54:21 +0000
Subject: [PATCH] make saturday sunday only visible if theres hours on them #92

refine styling of dialog for create/edit of timelogs to remove dropdown entry and remove issue of deleting text in input control from before.
---
 .../WindowsDataCenter/www/index.html          | 40 +++++++++----------
 .../WindowsDataCenter/www/spa.js              |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
index 5e2353b..3e2940d 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
@@ -274,16 +274,18 @@
                 </thead>
                 <tbody>
                 <!-- ko foreach: TimeLogs-->
-                <tr>
-                    <td class="valign" data-bind="text: DayOfWeek, contextMenu: $root.createContextMenu"></td>
-                    <!-- ko foreach: Logs -->
-                    <td class="valign" data-bind="text: $root.convertToDisplayTime(EventTime), contextMenu: $root.editContextMenu"></td>
+                    <!-- ko if: !((DayOfWeek === "Saturday" || DayOfWeek=== "Sunday") && LogCount===0)-->
+                        <tr>
+                            <td class="valign" data-bind="text: DayOfWeek, contextMenu: $root.createContextMenu"></td>
+                            <!-- ko foreach: Logs -->
+                            <td class="valign" data-bind="text: $root.convertToDisplayTime(EventTime), contextMenu: $root.editContextMenu"></td>
+                            <!-- /ko -->
+                            <!-- ko foreach: new Array($root.correctLogOffset($parent.MaxDailyLogCount)-LogCount)-->
+                            <td class="valign" data-bind="contextMenu: $root.createContextMenu"></td>
+                            <!-- /ko -->
+                            <td class="valign" data-bind="text: $root.convertToHours(DailyTotal), contextMenu: $root.createContextMenu"></td>
+                        </tr>
                     <!-- /ko -->
-                    <!-- ko foreach: new Array($root.correctLogOffset($parent.MaxDailyLogCount)-LogCount)-->
-                    <td class="valign" data-bind="contextMenu: $root.createContextMenu"></td>
-                    <!-- /ko -->
-                    <td class="valign" data-bind="text: $root.convertToHours(DailyTotal), contextMenu: $root.createContextMenu"></td>
-                </tr>
                 <!-- /ko -->
                 <tr>
                     <td class="valign" data-bind="attr:{colspan: $root.correctLogOffset(MaxDailyLogCount)+1}, contextMenu: $root.createContextMenu">Weekly Total</td>
@@ -335,20 +337,16 @@
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
                 <h4>MANUAL EDIT</h4>
             </div>
-            <div class="modal-body" style="height: 300px;">
+            <div class="modal-body" style="height: 400px;">
                 <form action="#manualLog" method="post" class="form-group">
                     <input type="hidden" name="Id" data-bind="value: Id"/>
                     <div class="form-group">
-                        <div class="input-group date" id="datetimepicker1">
-                            <input type="text" class="form-control" />
-                            <span class="input-group-addon">
-                                <span class="glyphicon glyphicon-calendar"></span>
-                            </span>
-                        </div>
+                        <div id="datetimepicker1"></div>
                     </div>
+                    <br/>
                     <div>
-                        <div class="input-group">
-                            <select data-bind="options: $root.possibleLogDirections, 
+                        <div class="input-group col-md-offset-1">
+                            <select class="form-control" data-bind="options: $root.possibleLogDirections, 
                                                optionsText: function(item) { return item.Text },
                                                optionsValue: function(item){ return item.value },
                                                value: Direction,
@@ -356,8 +354,10 @@
                         </div>
                     </div>
                     <br/>
-                    <button type="submit" class="btn btn-primary">Submit</button>
-                    <button type="button" class="btn btn-secondary close" data-dismiss="modal">Cancel</button>
+                    <div class="pull-right">
+                        <button type="submit" class="btn btn-primary">Submit</button>
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    </div>
                 </form>
             </div>
         </div>
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
index 254c8d6..0cbdae4 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
@@ -402,6 +402,7 @@
             .datetimepicker({
                 format: "YYYY-DD-MM HH:mm:ss",
                 date: new Date(date),
+                inline:true,
                 sideBySide:true,
                 minDate: moment(date).startOf("week"),
                 maxDate: moment(date).endOf("week")