From df4caa288d1db5e5f02feb3674dbdb0c601fad50 Mon Sep 17 00:00:00 2001
From: Zin Lin Phyo <zinlin.phyo@code2lab.com>
Date: Wed, 30 Aug 2017 10:46:46 +0630
Subject: [PATCH] jquery date-time picker

---
 .idea/.generators                             |   2 +-
 .idea/sxrestaurant.iml                        |   4 +-
 .idea/workspace.xml                           | 315 +++++++++++-------
 Gemfile                                       |  16 +-
 Gemfile.lock                                  |  29 +-
 app/assets/javascripts/application.js         |   5 +-
 app/assets/stylesheets/application.scss       |   4 +-
 .../origami/in_juties_controller.rb           |  19 +-
 .../in_juties/_assign_in_juty.html.erb        |  73 ++--
 .../origami/in_juties/index_in_juty.html.erb  |  87 +++--
 app/views/settings/promotions/new.html.erb    |   1 -
 dump.rdb                                      | Bin 742 -> 797 bytes
 12 files changed, 283 insertions(+), 272 deletions(-)

diff --git a/.idea/.generators b/.idea/.generators
index 16189766..98526fe7 100644
--- a/.idea/.generators
+++ b/.idea/.generators
@@ -5,4 +5,4 @@ You are allowed to:
 2. Remove generators
 3. Add installed generators
 To add new installed generators automatically delete this file and reload the project.
---><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>
+--><GeneratorsGroup><Generator name="assets" /><Generator name="cancan:ability" /><Generator name="channel" /><Generator name="coffee:assets" /><Generator name="controller" /><Generator name="factory_girl:model" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="jbuilder" /><Generator name="job" /><Generator name="js:assets" /><Generator name="kaminari:config" /><Generator name="kaminari:views" /><Generator name="mailer" /><Generator name="migration" /><Generator name="model" /><Generator name="nested_form:install" /><Generator name="resource" /><Generator name="rspec:controller" /><Generator name="rspec:feature" /><Generator name="rspec:helper" /><Generator name="rspec:install" /><Generator name="rspec:integration" /><Generator name="rspec:job" /><Generator name="rspec:mailer" /><Generator name="rspec:model" /><Generator name="rspec:observer" /><Generator name="rspec:request" /><Generator name="rspec:scaffold" /><Generator name="rspec:view" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="sidekiq:worker" /><Generator name="simple_form:install" /><Generator name="system_test" /><Generator name="task" /><Generator name="test_unit:controller" /><Generator name="test_unit:generator" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:job" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /><Generator name="test_unit:system" /><Generator name="uploader" /></GeneratorsGroup></Settings>
diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml
index 6c1240f7..53fef9e5 100644
--- a/.idea/sxrestaurant.iml
+++ b/.idea/sxrestaurant.iml
@@ -52,7 +52,6 @@
     <orderEntry type="library" scope="PROVIDED" name="connection_pool (v2.2.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="cups (v0.0.7, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="database_cleaner (v1.6.1, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="datetimepicker-rails (v@36d21c, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="erubi (v1.6.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.3.3) [gem]" level="application" />
@@ -66,7 +65,6 @@
     <orderEntry type="library" scope="PROVIDED" name="httparty (v0.15.5, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v0.8.6, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.7.0, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jquery-datatables-rails (v3.4.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jquery-datetimepicker-rails (v2.4.1.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v4.3.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jquery-ui-rails (v6.0.1, rbenv: 2.3.3) [gem]" level="application" />
@@ -82,7 +80,7 @@
     <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0521, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.2.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.10.3, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="momentjs-rails (v2.17.1@ea58a2, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="momentjs-rails (v2.17.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="multi_xml (v0.6.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mysql2 (v0.4.6, rbenv: 2.3.3) [gem]" level="application" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1c0d6110..705b1a97 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,17 @@
   <component name="ChangeListManager">
     <list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dump.rdb" afterPath="$PROJECT_DIR$/dump.rdb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.generators" afterPath="$PROJECT_DIR$/.idea/.generators" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/sxrestaurant.iml" afterPath="$PROJECT_DIR$/.idea/sxrestaurant.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/reports/commission_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/reports/commission_controller.rb" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb" afterPath="$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile" afterPath="$PROJECT_DIR$/Gemfile" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/javascripts/application.js" afterPath="$PROJECT_DIR$/app/assets/javascripts/application.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/assets/stylesheets/application.scss" afterPath="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings/promotions/new.html.erb" afterPath="$PROJECT_DIR$/app/views/settings/promotions/new.html.erb" />
     </list>
     <ignored path="$PROJECT_DIR$/.bundle/" />
     <ignored path="$PROJECT_DIR$/components/" />
@@ -21,7 +28,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/sxrestaurant@Development__sxrestaurant.coverage" NAME="Development: sxrestaurant Coverage Results" MODIFIED="1504001134539" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
+    <SUITE FILE_PATH="coverage/sxrestaurant@Development__sxrestaurant.coverage" NAME="Development: sxrestaurant Coverage Results" MODIFIED="1504066113816" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
     <SUITE FILE_PATH="coverage/sxrestaurant@db_migrate__sxrestaurant.coverage" NAME="db:migrate: sxrestaurant Coverage Results" MODIFIED="1503652404616" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
     <SUITE FILE_PATH="coverage/sxrestaurant@Rails_console__sxrestaurant.coverage" NAME="Rails console: sxrestaurant Coverage Results" MODIFIED="1503651318886" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="sxrestaurant" />
   </component>
@@ -48,55 +55,85 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/reports/commission/index.html.erb">
+      <file leaf-file-name="in_juties_controller.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="412">
-              <caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-              <folding>
-                <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#3;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="index.xls.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/reports/commission/index.xls.erb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
-              <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-              <folding>
-                <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="_commission_report_filter.html.erb" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="247">
-              <caret line="49" column="21" lean-forward="false" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" />
+            <state relative-caret-position="93">
+              <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="commission_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/reports/commission_controller.rb">
+      <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/settings/promotions/_form.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="216">
-              <caret line="12" column="26" lean-forward="false" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
+            <state relative-caret-position="-1366">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="product_commission.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/models/product_commission.rb">
+      <file leaf-file-name="new.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/settings/promotions/new.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+            <state relative-caret-position="234">
+              <caret line="13" column="33" lean-forward="true" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="_assign_in_juty.html.erb" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="197">
+              <caret line="15" column="133" lean-forward="false" selection-start-line="15" selection-start-column="133" selection-end-line="15" selection-end-column="133" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="index_in_juty.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="836">
+              <caret line="77" column="0" lean-forward="false" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Gemfile">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="12">
+              <caret line="93" column="10" lean-forward="false" selection-start-line="93" selection-start-column="10" selection-end-line="93" selection-end-column="10" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/assets/javascripts/application.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="342">
+              <caret line="25" column="33" lean-forward="false" selection-start-line="25" selection-start-column="33" selection-end-line="25" selection-end-column="33" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+                <marker date="1504065881000" expanded="true" signature="2006:2033" ph="..." />
+                <marker date="1504065881000" expanded="true" signature="2829:2856" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application.scss" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/application.scss">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="8" column="30" lean-forward="false" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
               <folding />
             </state>
           </provider>
@@ -136,12 +173,8 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/app/views/origami/commissions/index.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/commissions/show.html.erb" />
-        <option value="$PROJECT_DIR$/app/views/origami/commissioners/index.html.erb" />
         <option value="$PROJECT_DIR$/db/migrate/20170823075203_create_in_juties.rb" />
         <option value="$PROJECT_DIR$/db/migrate/20170823081747_create_in_juties.rb" />
-        <option value="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
         <option value="$PROJECT_DIR$/app/views/origami/home/show.html.erb" />
         <option value="$PROJECT_DIR$/app/views/origami/home/index_bk.html.erb" />
         <option value="$PROJECT_DIR$/db/migrate/20170822034139_create_product_commissions.rb" />
@@ -181,12 +214,16 @@
         <option value="$PROJECT_DIR$/app/models/product_commission.rb" />
         <option value="$PROJECT_DIR$/app/views/reports/commission/index.html.erb" />
         <option value="$PROJECT_DIR$/app/views/reports/commission/index.xls.erb" />
-        <option value="$PROJECT_DIR$/app/assets/javascripts/application.js" />
-        <option value="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
-        <option value="$PROJECT_DIR$/Gemfile" />
         <option value="$PROJECT_DIR$/Gemfile.lock" />
         <option value="$PROJECT_DIR$/app/controllers/reports/commission_controller.rb" />
         <option value="$PROJECT_DIR$/app/views/reports/commission/_commission_report_filter.html.erb" />
+        <option value="$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb" />
+        <option value="$PROJECT_DIR$/Gemfile" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb" />
+        <option value="$PROJECT_DIR$/app/assets/javascripts/application.js" />
+        <option value="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
+        <option value="$PROJECT_DIR$/app/views/settings/promotions/new.html.erb" />
+        <option value="$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb" />
       </list>
     </option>
   </component>
@@ -211,6 +248,7 @@
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="1440" />
     <option name="y" value="22" />
     <option name="width" value="1440" />
     <option name="height" value="834" />
@@ -258,14 +296,22 @@
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
-              <item name="reports" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
               <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="origami" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="origami" type="462c0819:PsiDirectoryNode" />
+              <item name="in_juties" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
@@ -297,6 +343,14 @@
               <item name="settings" type="462c0819:PsiDirectoryNode" />
               <item name="commissions" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="sxrestaurant" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sxrestaurant" type="462c0819:PsiDirectoryNode" />
+              <item name="app" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="settings" type="462c0819:PsiDirectoryNode" />
+              <item name="promotions" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -702,12 +756,12 @@
       <workItem from="1503457057830" duration="7166000" />
       <workItem from="1503472116907" duration="50209000" />
       <workItem from="1503843212665" duration="21267000" />
-      <workItem from="1503909487511" duration="29840000" />
+      <workItem from="1503909487511" duration="36125000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="182458000" />
+    <option name="totallyTimeSpent" value="188743000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -719,20 +773,20 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="22" width="1440" height="833" extended-state="6" />
+    <frame x="1440" y="22" width="1920" height="1058" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27110156" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20181043" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917964" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978722" sideWeight="0.5" order="10" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17412141" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3258786" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4878049" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48701972" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3759086" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4905149" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.49013498" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39701897" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3561786" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -750,40 +804,11 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="24" />
+      <option name="time" value="25" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/_form.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="6" column="4" lean-forward="false" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="127" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/assets/javascripts/CRM.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="18" column="21" lean-forward="true" selection-start-line="18" selection-start-column="21" selection-end-line="18" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/crm/customers/_form.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="33" lean-forward="false" selection-start-line="0" selection-start-column="33" selection-end-line="0" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/CRM.scss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-913">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="269">
@@ -970,14 +995,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="130">
-          <caret line="50" column="46" lean-forward="false" selection-start-line="50" selection-start-column="32" selection-end-line="50" selection-end-column="46" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/config/routes.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="489">
@@ -994,14 +1011,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/promotion.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="21" column="7" lean-forward="true" selection-start-line="21" selection-start-column="7" selection-end-line="21" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/views/home/index.html.erb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="881">
@@ -1102,26 +1111,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/assets/javascripts/application.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="117">
-          <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <marker date="1504008524000" expanded="true" signature="2104:2131" ph="..." />
-            <marker date="1504008524000" expanded="true" signature="2927:2954" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/application.scss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="10" column="35" lean-forward="false" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Gemfile.lock">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="203">
@@ -1130,14 +1119,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Gemfile">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="526">
-          <caret line="121" column="32" lean-forward="false" selection-start-line="121" selection-start-column="32" selection-end-line="121" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/views/settings/commissions/load_commissioners.html.erb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="249">
@@ -1162,5 +1143,81 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/models/promotion.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="91">
+          <caret line="17" column="45" lean-forward="true" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/promotions/_form.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1366">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/settings/promotions/new.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <caret line="13" column="33" lean-forward="true" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/assets/javascripts/application.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="25" column="33" lean-forward="false" selection-start-line="25" selection-start-column="33" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+            <marker date="1504065881000" expanded="true" signature="2006:2033" ph="..." />
+            <marker date="1504065881000" expanded="true" signature="2829:2856" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/application.scss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="8" column="30" lean-forward="false" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Gemfile">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="12">
+          <caret line="93" column="10" lean-forward="false" selection-start-line="93" selection-start-column="10" selection-end-line="93" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/index_in_juty.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="836">
+          <caret line="77" column="0" lean-forward="false" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/in_juties_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="93">
+          <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/origami/in_juties/_assign_in_juty.html.erb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="197">
+          <caret line="15" column="133" lean-forward="false" selection-start-line="15" selection-start-column="133" selection-end-line="15" selection-end-column="133" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 91e29a6e..93b245eb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'simple_form'
 gem 'nested_form'
 gem 'bootstrap', '~> 4.0.0.alpha3'
 gem 'tether-rails'
-gem "font-awesome-rails"
+gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2'
 gem 'rack-cors'
 
 # image upload
@@ -53,7 +53,6 @@ gem 'to_xls-rails'
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
-gem 'jquery-datatables-rails', '~> 3.4.0'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -112,13 +111,8 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gem 'httparty', '~> 0.15.5'
 
-gem 'momentjs-rails', :git => 'git://github.com/derekprior/momentjs-rails.git'
-gem 'bootstrap-daterangepicker-rails'
-# # gem 'momentjs-rails', '>= 2.9.0'
-# gem 'bootstrap3-datetimepicker-rails'
-# gem 'momentjs-rails', '>= 2.9.0'
-# gem 'bootstrap3-datetimepicker-rails'
-gem 'datetimepicker-rails', github: 'zpaulovics/datetimepicker-rails', branch: 'master', submodules: true
-gem 'bootstrap-datepicker-rails'
+gem 'momentjs-rails' # for date-range selector
+gem 'bootstrap-daterangepicker-rails' # date-range picker
+gem 'bootstrap-datepicker-rails' # date picker
 gem 'jquery-datetimepicker-rails'
-gem 'select2-rails'
+gem 'select2-rails' # for multi-select and auto-complete select box
diff --git a/Gemfile.lock b/Gemfile.lock
index b567932e..b2a6e59c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,19 +1,3 @@
-GIT
-  remote: git://github.com/derekprior/momentjs-rails.git
-  revision: ea58a20b7b2c901831dd01f34e0054ef6c75bde8
-  specs:
-    momentjs-rails (2.17.1)
-      railties (>= 3.1)
-
-GIT
-  remote: https://github.com/zpaulovics/datetimepicker-rails.git
-  revision: 36d21cec5da7f5b214925804f60e63c61c747023
-  branch: master
-  submodules: true
-  specs:
-    datetimepicker-rails (4.7.16)
-      momentjs-rails (>= 2.9.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -107,11 +91,6 @@ GEM
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
-    jquery-datatables-rails (3.4.0)
-      actionpack (>= 3.1)
-      jquery-rails
-      railties (>= 3.1)
-      sass-rails
     jquery-datetimepicker-rails (2.4.1.0)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
@@ -144,6 +123,8 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.2.0)
     minitest (5.10.3)
+    momentjs-rails (2.17.1)
+      railties (>= 3.1)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     mysql2 (0.4.6)
@@ -286,20 +267,18 @@ DEPENDENCIES
   coffee-rails (~> 4.2)
   cups (~> 0.0.7)
   database_cleaner
-  datetimepicker-rails!
   factory_girl_rails (~> 4.0)
   faker
   filterrific
-  font-awesome-rails
+  font-awesome-rails (~> 4.7, >= 4.7.0.2)
   httparty (~> 0.15.5)
   jbuilder (~> 2.5)
-  jquery-datatables-rails (~> 3.4.0)
   jquery-datetimepicker-rails
   jquery-rails
   jquery-ui-rails
   kaminari (~> 1.0.1)
   listen (~> 3.0.5)
-  momentjs-rails!
+  momentjs-rails
   mysql2 (>= 0.3.18, < 0.5)
   nested_form
   pg
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 87ca5d6d..b1879bba 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -20,13 +20,10 @@
 //= require settings/processing_items
 //= require jquery-ui
 //= require bootstrap-datepicker
-//= require jquery.datetimepicker
-//= require dataTables/jquery.dataTables
 //= require moment
 //= require daterangepicker
 //= require select2
-//= require bootstrap-datetimepicker
-//= require pickers
+//= require jquery.datetimepicker
 
 
 $(document).on('turbolinks:load', function() {
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 1cc201dd..4aabe81b 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -4,11 +4,9 @@
 @import "theme";
 @import "jquery-ui";
 @import "bootstrap-datepicker3";
-@import "jquery.datetimepicker";
-@import "dataTables/jquery.dataTables";
 @import "daterangepicker-bs3";
 @import "select2";
-@import "bootstrap-datetimepicker";
+@import "jquery.datetimepicker";
 
 /* Show it is fixed to the top */
 // body {
diff --git a/app/controllers/origami/in_juties_controller.rb b/app/controllers/origami/in_juties_controller.rb
index 5903ace3..6ac04659 100644
--- a/app/controllers/origami/in_juties_controller.rb
+++ b/app/controllers/origami/in_juties_controller.rb
@@ -12,7 +12,6 @@ class Origami::InJutiesController < BaseOrigamiController
     @table = DiningFacility.find(params[:table_id])
     @in_juty   = InJuty.new
     @juties_in = Kaminari.paginate_array(@juty_in).page(params[:page]).per(10)
-
   end
   # GET /in_juties/1
   # GET /in_juties/1.json
@@ -60,10 +59,10 @@ class Origami::InJutiesController < BaseOrigamiController
   def create_for_in_juty
     @in_juty = InJuty.new
 
-    @in_juty.dinning_id = in_juty_params[:dinning_id] 
-    @in_juty.commissioner_ids = in_juty_params[:commissioner_ids] 
-    @in_juty.in_time = in_juty_params[:in_time] 
-    @in_juty.out_time = in_juty_params[:out_time]  
+    @in_juty.dinning_id = in_juty_params[:dinning_id]
+    @in_juty.commissioner_ids = in_juty_params[:commissioner_ids]
+    @in_juty.in_time = in_juty_params[:in_time]
+    @in_juty.out_time = in_juty_params[:out_time]
 
 
     respond_to do |format|
@@ -75,7 +74,7 @@ class Origami::InJutiesController < BaseOrigamiController
         format.json { render json: @in_juty.errors, status: :unprocessable_entity }
       end
     end
-    
+
   end
 
   # PATCH/PUT /in_juties/1
@@ -93,9 +92,9 @@ class Origami::InJutiesController < BaseOrigamiController
   end
 
 
-    def update_for_in_juty 
-        @in_juty.commissioner_ids = in_juty_params[:commissioner_ids] 
-        @in_juty.in_time = in_juty_params[:in_time] 
+    def update_for_in_juty
+        @in_juty.commissioner_ids = in_juty_params[:commissioner_ids]
+        @in_juty.in_time = in_juty_params[:in_time]
         @in_juty.out_time = in_juty_params[:out_time]
         respond_to do |format|
           if @in_juty.save
@@ -121,7 +120,7 @@ class Origami::InJutiesController < BaseOrigamiController
   def destroy_in_juty
     @table_id = params[:table_id]
     @in_juty.destroy
-    
+
     respond_to do |format|
       format.html { redirect_to origami_index_in_juty_path(@table_id), notice: 'In juty was successfully destroyed.' }
       format.json { head :no_content }
diff --git a/app/views/origami/in_juties/_assign_in_juty.html.erb b/app/views/origami/in_juties/_assign_in_juty.html.erb
index 81af7d29..62531529 100644
--- a/app/views/origami/in_juties/_assign_in_juty.html.erb
+++ b/app/views/origami/in_juties/_assign_in_juty.html.erb
@@ -1,46 +1,43 @@
-<%= simple_form_for  @in_juty,:url => origami_index_in_juty_path(@table.id), :method => :post do |f| %>
-  <span class="patch_method"></span>
-  <%= f.error_notification %>
-  <%= f.hidden_field :id, :class => "form-control col-md-6 " %> 
-  
-  <div class="form-inputs">
+<%= simple_form_for @in_juty, :url => origami_index_in_juty_path(@table.id), :method => :post do |f| %>
+    <span class="patch_method"></span>
+    <%= f.error_notification %>
+    <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
 
-  <%= f.hidden_field :dinning_id,:value => @table.id, :class => "form-control col-md-6 " %>
+    <div class="form-inputs">
+
+      <%= f.hidden_field :dinning_id, :value => @table.id, :class => "form-control col-md-4 " %>
+
+      <label>Dining Name:</label>
+      <%= @table.name %>
+      <br/>
+      <br/>
+
+      <label>Commissioner Name:</label>
+      <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %>
+      <br/><br/>
+
+      <%= f.input :in_time, :placeholder => "From Date", :class => "form-control" %>
+
+      <%= f.input :out_time, :placeholder => "From Date", :class => "form-control" %>
+
+    </div><br>
+
+    <div class="form-group">
+      <%= f.button :submit, "Create", :class => 'btn btn-primary ', :id => 'create' %>
+      <%= f.button :submit, "Update", :class => 'btn btn-primary ', :disabled => '', :id => 'update' %>
+      <%= f.button :button, "Reset", :class => 'btn btn-danger ', :id => 'reset' %>
+    </div>
 
-     <label>Dining Name:</label>
-    <%= @table.name %>
-    <br/>
-    <br/>
-    
-    <label>Commissioner Name:</label>
-    <%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %><br/><br/>
-    
-         <%= f.input  :in_time, :placeholder => "From Date" , :class => "form-control", :as => :datetime_picker%>
-     
-         <%= f.input  :out_time, :placeholder => "From Date" , :class => "form-control", :as => :datetime_picker%>
-  </div><br>
-  
-   <div class="form-group">
-        <%= f.button :submit, "Create",:class => 'btn btn-primary ', :id => 'create' %>
-        <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update' %>
-        <%= f.button :button, "Reset",:class => 'btn btn-danger ', :id => 'reset' %>
-  </div>
- 
 <% end %>
 
 
 <script type="text/javascript">
 
-$(document).ready(function(){
-  // $('#in_juty_in_time').datetimepicker();
-  // $('#in_juty_out_time').datetimepicker();
-  $('#reset').click(function() {
+    $(document).ready(function () {
+        $('#reset').click(function () {
+            location.reload();
+            return false;
+        });
+    });
 
-    // window.location.href = '/origami/assign_in_juty/'+ table_id;
-    location.reload();
-
-    return false;
-  });
-});
-
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/origami/in_juties/index_in_juty.html.erb b/app/views/origami/in_juties/index_in_juty.html.erb
index 2ac1048e..bbb9912b 100644
--- a/app/views/origami/in_juties/index_in_juty.html.erb
+++ b/app/views/origami/in_juties/index_in_juty.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  
+
   <div class="col-md-8">
     <table class="table table-striped">
       <thead>
@@ -16,74 +16,67 @@
       <tbody>
       <% @juties_in.each do |in_juty| %>
           <tr class="injuty_tr" data-ref="<%= in_juty.id %>">
-          <td>
-                     <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
+            <td>
+              <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check"></td>
             <td><%= in_juty.dining_facility.name rescue '-' %></td>
             <td><%= in_juty.commissioner.name rescue '-' %></td>
             <td><%= in_juty.in_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
             <td><%= in_juty.out_time.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") rescue '-' %></td>
-            <td><%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id,in_juty),method: :delete, data: {confirm: 'Are you sure?'} %></td>
+            <td><%= link_to 'Destroy', origami_destroy_in_juty_path(in_juty.dining_facility.id, in_juty), method: :delete, data: {confirm: 'Are you sure?'} %></td>
           </tr>
       <% end %>
       </tbody>
     </table>
     <%= paginate @juties_in %>
   </div>
- 
+
   <div class="col-md-4">
-    <%= render 'assign_in_juty', in_juty: @in_juty ,table: @table %>
+    <%= render 'assign_in_juty', in_juty: @in_juty, table: @table %>
   </div>
 </div>
 
 <div class="col-md-1">
-<button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
+  <button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
 </div>
 
 <script type="text/javascript">
-$(document).on('click',".injuty_tr",function(){
-    
-     // if(this.checked){
-          $(this).closest('tr').find('.checkbox_check').prop( "checked", true );
-            //$( "#checkbox_check" ).prop( "checked", true );
-          
-            var in_juty_id = $(this).attr('data-ref');
-            var table_id = "<%= @table.id %>";
-            var url = "/origami/assign_in_juty/table/" + table_id + "/in_juty/" + in_juty_id + "/edit";
-            
-              $.ajax({
-                type: "GET",
-                url: url,
-                data: {},
-                
-                success: function(data) {                    
-                  // Selected for Taxes  
-                 
-                   $('#in_juty_id').val(data.in_juty.id);
-                   $('#in_juty_commissioner_ids').val(data.commissioner.id);
-                    $('#in_juty_in_time').val(data.in_juty.in_time.split('T')[0]);
-                    $('#in_juty_out_time').val(data.in_juty.out_time.split('T')[0]);
+    $(document).on('click', ".injuty_tr", function () {
 
-                    $('#update').removeAttr('disabled').val('');
-                    $('#update').attr('value', 'Update');
-                    $('#create').attr('disabled','disabled');
+        $(this).closest('tr').find('.checkbox_check').prop("checked", true);
 
-                    $("#new_in_juty").attr('class', 'simple_form edit_in_juty');
-                    var id = "edit_in_juty_" + in_juty_id;
-                    $("#new_in_juty").attr('id', id);
+        var in_juty_id = $(this).attr('data-ref');
+        var table_id = "<%= @table.id %>";
+        var url = "/origami/assign_in_juty/table/" + table_id + "/in_juty/" + in_juty_id + "/edit";
 
-                    $(".edit_in_juty").attr('id', id);
-                    $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
-                    $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
-                    $(".patch_method").html('<input type="hidden" name="_method" value="patch">');
-                }
-             });
-          // }else{
+        $.ajax({
+            type: "GET",
+            url: url,
+            data: {},
 
-          // }
-  })
+            success: function (data) {
 
+                $('#in_juty_id').val(data.in_juty.id);
+                $('#in_juty_commissioner_ids').val(data.commissioner.id);
+                $('#in_juty_in_time').val(data.in_juty.in_time);
+                $('#in_juty_out_time').val(data.in_juty.out_time);
 
-   $('#back').on('click', function () {
-        window.location.href = '/origami/table/'+ "<%= @table.id %>";
+                $('#update').removeAttr('disabled').val('');
+                $('#update').attr('value', 'Update');
+                $('#create').attr('disabled', 'disabled');
+
+                $("#new_in_juty").attr('class', 'simple_form edit_in_juty');
+                var id = "edit_in_juty_" + in_juty_id;
+                $("#new_in_juty").attr('id', id);
+
+                $(".edit_in_juty").attr('id', id);
+                $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
+                $(".edit_in_juty").attr('action', '/origami/edit_in_juty/' + $('#in_juty_id').val());
+                $(".patch_method").html('<input type="hidden" name="_method" value="patch">');
+            }
+        });
+    });
+
+    $('#back').on('click', function () {
+        window.location.href = '/origami/table/' + "<%= @table.id %>";
     })
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/settings/promotions/new.html.erb b/app/views/settings/promotions/new.html.erb
index c7748bb6..321aa4d1 100644
--- a/app/views/settings/promotions/new.html.erb
+++ b/app/views/settings/promotions/new.html.erb
@@ -13,5 +13,4 @@
 $("#promotion_promo_code").val(Math.random().toString(36).slice(5) + Math.random().toString(36).slice(5));
 // $( "#fromtime" ).timepicker();
 // $( "#totime" ).timepicker({ 'scrollDefault': 'now' });
-$('#scrollDefaultExample').timepicker({ 'scrollDefault': 'now' });
 </script>
diff --git a/dump.rdb b/dump.rdb
index dfef99fa9e38d3f64010e723188ff089a36840af..332310c7de18a2a63f99b8eafc63674d6ba26c52 100644
GIT binary patch
delta 167
zcmaFHI+tyNfy7_yWs$!)N{drdbaPX44{i7(%kYokw;<!hdhv<z?2{)jO0XCh9blZS
zz$iAcTAIaN*T`&Qt>h#|>&c3Y!oonV!2t#a?&6Zf605Yt%$(GeiM7&9#s(9&8v_-H
z0$Gz28MQ<WEe<d+u@#o4mZlanvZth`C6?xtOzvltW&LBI6K%Np5F<aMsF|6msga(M
TxuKbn`G4Inw)qcVr<wx*H9j@k

delta 147
zcmV;E0BrxA2Id8jFc@K%rCIt2b#rB8Ep26O!f@af0R8~`4*`*!8UZko?ii7n8wNNn
zFfzaak(?cqPysQKofwhQISdPPbYXNlW?^Y;Wn_`=7L&jM29ufrD3c%o1(9YLlkfoq
z76Jxwb!ByBa{&irWoBV@Y;^o!G}tb)`2i0B6*4q5F*GhWGB7hWGXHhGipT+t@)ySd
BHCg}w