From 793d7304b17b91510d419fb7497decf29060675f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yi=C4=9Fit=20=C3=87olako=C4=9Flu?=
 <yigitcolakoglu@hotmail.com>
Date: Fri, 22 Jun 2018 01:09:46 +0300
Subject: [PATCH] connected

connected all the python files together
---
 Barcode_Reader_Python/.idea/workspace.xml  | 158 +++++++++++---
 Barcode_Reader_Python/database_actions.pyc | Bin 2096 -> 2096 bytes
 Barcode_Reader_Python/generate_moves.py    | 120 ++++++-----
 Barcode_Reader_Python/generate_moves.pyc   | Bin 0 -> 3564 bytes
 Barcode_Reader_Python/main.py              |  20 +-
 Barcode_Reader_Python/sort_date.py         | 235 +++++++++++----------
 Barcode_Reader_Python/sort_date.pyc        | Bin 0 -> 3507 bytes
 7 files changed, 325 insertions(+), 208 deletions(-)
 create mode 100644 Barcode_Reader_Python/generate_moves.pyc
 create mode 100644 Barcode_Reader_Python/sort_date.pyc

diff --git a/Barcode_Reader_Python/.idea/workspace.xml b/Barcode_Reader_Python/.idea/workspace.xml
index 35c9887..3b3af7c 100644
--- a/Barcode_Reader_Python/.idea/workspace.xml
+++ b/Barcode_Reader_Python/.idea/workspace.xml
@@ -2,25 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b5ef56c-2d3e-44d9-be69-b414f166f99b" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitkeep" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/Barcode_Reader_Python.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/arduino-i2c/arduino-i2c.ino" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/barcodes.csv" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/database_actions.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/pi@192.168.1.25" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/raspberry_zbar.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/run.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/sort_calc_base_1hand.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/sort_calc_base_2handed.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/sort_date.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/zbar.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/zbar_live.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../FoodCloud.apk" beforeDir="false" afterPath="$PROJECT_DIR$/../FoodCloud.apk" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../get-pip.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/generate_moves.py" beforeDir="false" afterPath="$PROJECT_DIR$/generate_moves.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sort_date.py" beforeDir="false" afterPath="$PROJECT_DIR$/sort_date.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -31,12 +15,45 @@
   </component>
   <component name="CoverageDataManager">
     <SUITE FILE_PATH="coverage/Barcode_Reader_Python$RUN.coverage" NAME="RUN Coverage Results" MODIFIED="1529584815747" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/Barcode_Reader_Python$generate_moves.coverage" NAME="generate_moves Coverage Results" MODIFIED="1529614908540" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/Barcode_Reader_Python$raspberry_live.coverage" NAME="raspberry_live Coverage Results" MODIFIED="1529585357099" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/Barcode_Reader_Python$main.coverage" NAME="main Coverage Results" MODIFIED="1529587310168" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/Barcode_Reader_Python$sort_date.coverage" NAME="sort_date Coverage Results" MODIFIED="1529590504238" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/Barcode_Reader_Python$main.coverage" NAME="main Coverage Results" MODIFIED="1529615873965" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/Barcode_Reader_Python$Unnamed.coverage" NAME="raspberry_live Coverage Results" MODIFIED="1529543452123" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="main.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/main.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="285">
+              <caret line="75" lean-forward="true" selection-start-line="75" selection-end-line="75" />
+              <folding>
+                <element signature="e#32#69#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="generate_moves.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/generate_moves.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="285">
+              <caret line="117" column="100" selection-start-line="117" selection-start-column="100" selection-end-line="117" selection-end-column="100" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="sort_date.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/sort_date.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="315">
+              <caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -49,6 +66,9 @@
     <findStrings>
       <find />
       <find>cam.read</find>
+      <find>dates_orig</find>
+      <find>dates</find>
+      <find>shelf_new</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -60,6 +80,8 @@
         <option value="$PROJECT_DIR$/run.py" />
         <option value="$PROJECT_DIR$/zbar_live.py" />
         <option value="$PROJECT_DIR$/raspberry_zbar.py" />
+        <option value="$PROJECT_DIR$/sort_date.py" />
+        <option value="$PROJECT_DIR$/generate_moves.py" />
         <option value="$PROJECT_DIR$/main.py" />
       </list>
     </option>
@@ -139,6 +161,25 @@
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
+    <configuration name="generate_moves" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="Barcode_Reader_Python" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/generate_moves.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+    </configuration>
     <configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="Barcode_Reader_Python" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -177,14 +218,37 @@
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
+    <configuration name="sort_date" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="Barcode_Reader_Python" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/sort_date.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+    </configuration>
     <list>
       <item itemvalue="Python.raspberry_live" />
       <item itemvalue="Python.RUN" />
       <item itemvalue="Python.main" />
+      <item itemvalue="Python.sort_date" />
+      <item itemvalue="Python.generate_moves" />
     </list>
     <recent_temporary>
       <list>
         <item itemvalue="Python.main" />
+        <item itemvalue="Python.generate_moves" />
+        <item itemvalue="Python.sort_date" />
       </list>
     </recent_temporary>
   </component>
@@ -202,22 +266,23 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1920" y="-4" width="1366" height="772" extended-state="6" />
+    <frame x="1920" y="-4" width="1366" height="772" extended-state="7" />
+    <editor active="true" />
     <layout>
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5007587" side_tool="true" weight="0.4638365" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49924126" weight="0.27056962" />
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Python Console" order="7" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49924126" visible="true" weight="0.27056962" />
       <window_info anchor="bottom" id="Terminal" order="7" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26327768" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.26783004" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info anchor="right" id="SciView" order="3" weight="0.32928678" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.39873418" />
       <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39873418" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.24962063" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -226,6 +291,29 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32911393" />
     </layout>
+    <layout-to-restore>
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.24962063" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26783004" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" id="SciView" order="3" weight="0.32928678" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49924126" visible="true" weight="0.27056962" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32911393" />
+      <window_info anchor="bottom" id="Python Console" order="10" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39873418" />
+      <window_info anchor="right" id="Database" order="4" />
+      <window_info anchor="bottom" id="Terminal" order="11" />
+      <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.5007587" side_tool="true" weight="0.4638365" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -240,25 +328,25 @@
     <entry file="file://$PROJECT_DIR$/run.py" />
     <entry file="file://$PROJECT_DIR$/barcodes.csv" />
     <entry file="file://$PROJECT_DIR$/raspberry_zbar.py" />
-    <entry file="file://$PROJECT_DIR$/zbar_live.py">
+    <entry file="file://$PROJECT_DIR$/zbar_live.py" />
+    <entry file="file://$PROJECT_DIR$/generate_moves.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="33" selection-start-line="33" selection-end-line="33" />
-          <folding>
-            <element signature="e#0#25#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="285">
+          <caret line="117" column="100" selection-start-line="117" selection-start-column="100" selection-end-line="117" selection-end-column="100" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/generate_moves.py">
+    <entry file="file://$PROJECT_DIR$/sort_date.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-630" />
+        <state relative-caret-position="315">
+          <caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
+        </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+        <state relative-caret-position="285">
+          <caret line="75" lean-forward="true" selection-start-line="75" selection-end-line="75" />
           <folding>
             <element signature="e#32#69#0" expanded="true" />
           </folding>
diff --git a/Barcode_Reader_Python/database_actions.pyc b/Barcode_Reader_Python/database_actions.pyc
index 488df9277df45347fe354101711eff9790fcacf7..3351c9dece317bc2d9b6d2284d317251eceb9cb2 100644
GIT binary patch
delta 16
XcmdlWut9*G`7<xq)0NsA*)=%;FKY!i

delta 16
XcmdlWut9*G`7<xqVO`mc?3x?^D^CQA

diff --git a/Barcode_Reader_Python/generate_moves.py b/Barcode_Reader_Python/generate_moves.py
index bfd6257..6e05a81 100644
--- a/Barcode_Reader_Python/generate_moves.py
+++ b/Barcode_Reader_Python/generate_moves.py
@@ -1,29 +1,12 @@
 import sort_date
-exp_date , dates_orig = sort_date.calcDate()
-shelf_back = exp_date[:]
-try:
-    expired = exp_date.count(-1)
-    for i in range(expired):
-        shelf_back.pop(shelf_back.index(-1))
-
-    shelf_new  = sorted(shelf_back)
-    for i in range(expired):
-        shelf_new.append(-1)
-except ValueError:
-    print('')
-exp_date.append(None)
-shelf_new.append(None)
-repeats = 0
+
 correct_locs = []
 temp = None
 moved_item = None
 moved_item_loc = None
-
-
-print "\n\n\n//////////////////////////////////////////////////////////////////////////////"
-print("                  {}               ".format(exp_date))
-print("                  {}               ".format(shelf_new))
-print "/////////////////////////////////////////////////////////////////////////////\n\n\n"
+exp_date = []
+shelf_new = []
+repeats = 0
 
 def backArray(myArray):
     global shelf_back
@@ -31,6 +14,7 @@ def backArray(myArray):
     for i in range(len(myArray)):
         shelf_back.append(myArray[i])
 
+
 def eqArray(myArray):
     global exp_date
     exp_date = []
@@ -45,62 +29,90 @@ def place():
     global shelf_back
     repeats += 1
     backArray(exp_date)
-    
-    if (exp_date[len(exp_date)-1] != None):
+    moved_item = None
+    moved_item_loc = None
+
+    if (exp_date[len(exp_date) - 1] != None):
         empty_loc = exp_date.index(None)
         moved_item_loc = exp_date.index(shelf_new[empty_loc])
-        reps=0
+        reps = 0
         while True:
             reps += 1
-            if(moved_item_loc in correct_locs):
+            if (moved_item_loc in correct_locs):
                 exp_date.pop(moved_item_loc)
                 moved_item_loc = exp_date.index(shelf_new[empty_loc]) + reps
                 continue
             break
         eqArray(shelf_back)
         moved_item = exp_date[moved_item_loc]
-        if(exp_date[moved_item_loc] != shelf_new[moved_item_loc]):
+        if (exp_date[moved_item_loc] != shelf_new[moved_item_loc]):
             exp_date[moved_item_loc] = None
             exp_date[empty_loc] = moved_item
             correct_locs.append(empty_loc)
-            
 
-            print "        Moved item {0} to location {1}. Location {2} is now empty!".format(moved_item,empty_loc + 1, moved_item_loc + 1)
+            print "        Moved item {0} to location {1}. Location {2} is now empty!".format(moved_item, empty_loc + 1,
+                                                                                              moved_item_loc + 1)
             print "============================================================================"
         else:
-            print "      Leaving item {0} in location {1}. Location {2} is still empty!".format(moved_item, moved_item_loc + 1,empty_loc + 1)
+            print "      Leaving item {0} in location {1}. Location {2} is still empty!".format(moved_item,
+                                                                                                moved_item_loc + 1,
+                                                                                                empty_loc + 1)
             print "============================================================================"
             correct_locs.append(moved_item_loc)
         place()
     else:
         return
-    
 
 
+def generate(dates,date_cur):
+    global exp_date
+    global shelf_new
+    global repeats
+    exp_date = sort_date. calcDate(dates,date_cur)
+    shelf_back = exp_date[:]
+    try:
+        expired = exp_date.count(-1)
+        for i in range(expired):
+            shelf_back.pop(shelf_back.index(-1))
+
+        shelf_new  = sorted(shelf_back)
+        for i in range(expired):
+            shelf_new.append(-1)
+    except ValueError:
+        print('')
+    exp_date.append(None)
+    shelf_new.append(None)
+    repeats = 0
+
 
-while True:
-    if(repeats < len(exp_date)):
-        for i in range(len(exp_date)):
-            if(exp_date[len(exp_date)-1] == None):
-                if(exp_date[i] == shelf_new[i]):
-                    continue
-                else:
-                    exp_date[len(exp_date)-1] = exp_date[i]
-                    print '\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
-                    print '     TEMP IS EMPTY, MOVING {0} FROM LOCATION {1} TO THE TEMP'.format(exp_date[i],i+1)
-                    print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n'
-                    print "============================================================================"
-                    exp_date[i] = None
+    print "\n\n\n//////////////////////////////////////////////////////////////////////////////"
+    print("                  {}               ".format(exp_date))
+    print("                  {}               ".format(shelf_new))
+    print "/////////////////////////////////////////////////////////////////////////////\n\n\n"
 
+    while True:
+        if(repeats < len(exp_date)):
+            for i in range(len(exp_date)):
+                if(exp_date[len(exp_date)-1] == None):
+                    if(exp_date[i] == shelf_new[i]):
+                        continue
+                    else:
+                        exp_date[len(exp_date)-1] = exp_date[i]
+                        print '\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
+                        print '     TEMP IS EMPTY, MOVING {0} FROM LOCATION {1} TO THE TEMP'.format(exp_date[i],i+1)
+                        print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n'
+                        print "============================================================================"
+                        exp_date[i] = None
 
-    else:
-        break
-    place()
-
-try:
-    print('***********************************************************************************')
-    print('          The last {} items have expired, throwing them away.'.format(len(exp_date)-shelf_new.index(-1)-1))
-    print('***********************************************************************************')
-except ValueError:
-    print("                              No items have expired")
-    print('***********************************************************************************')
+
+        else:
+            break
+        place()
+
+    try:
+        print('***********************************************************************************')
+        print('          The last {} items have expired, throwing them away.'.format(len(exp_date)-shelf_new.index(-1)-1))
+        print('***********************************************************************************')
+    except ValueError:
+        print("                              No items have expired")
+        print('***********************************************************************************')
\ No newline at end of file
diff --git a/Barcode_Reader_Python/generate_moves.pyc b/Barcode_Reader_Python/generate_moves.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bc54bc8e3d00475d3d6e7a1f0082956acb4825b9
GIT binary patch
literal 3564
zcmcInTW=Fr5T3KXB;MG82AT`KZB$jVD2fTRf=UJz2n9r9hmDI{s>s@U53v(_*WNuL
zv522islTGCD)p@o{EGgXKK2K+-;CEuK$ZI9taE1PoSic>XU^P``nzD4=dS(Gq~yuq
z{WV5>0N~?KQHSUS(GH;E>5G)Ww7?9nds%@~<XhxTlb@oWK%65#Er?BiMvxiuvx4MF
z=g9{>h(Tu44!Gs$*dhf1Tg4g3ZvTU)(gsFN1z=&MF&<#Vw*go%(c$N06d8+-h>jKi
zt!*#R5KBb6DPBENw1j2VU!pn=v{htol_K*pHZyDK&dbJ+UUSdz;Uh2D(Iy3~qXU!0
z+w1jo;1^i|GX>Bc+>0V_0I|@r2tWejHDIMy*wv*$d#CM(rCt>7>ZXZHb+_7h=9cbz
zQ8V;)!_}UzqsHdIw8EgYqXQjzMmM_QD;=-&1||natdEFcTg0peSy{EDn&)PVX^7B=
zy@n56T$bYUiCwmYoZV%Mxoo2II5Qho_vOTMK+m2SQ@ME-Ew{f7?Qp$tm0KP#xqiN3
z-0o1EmapF;lV*qyAY5F+$GsFq-zu!_X4tjyWe6&n;-Zf%@e}NY8xK=-_>`|ZdP7Iz
z@VBr8S2EMIm!;?r*_Y!Lmi#UgY*_%KzNUa^6R$d4&CHBx*(ISVb}`1X@nY>h;xmkv
z%Wz%BEGk3hZk{nYWQukR;@1`*Yyn&Ob)2F{j}dT>9tSHNZwbxlBeuRxlW<IwpQU3W
z6(9x?9z2TdZ<RJXfdpWDADELo8*o$KX&c>jUSA(NCUiPs(=+Wba9*ztSDf{e*^Qyo
zj-4PpaCEn42Fvj}*xZ@mBOy0ZYh8P<+QH7LUhUw2^omWp(@8WdUVvs2+>!2S&%`cU
zz-6a|7r_=`pd}n6MYIE7A4-&taz~&KgsK+pYm*0gGmIhxeglSyC6)BTp3Cv&VvIsc
zGRw;_>Uu_a_BviupC%>F1%88#Y-X|LbjmzMw3t+8tRU2m&mk<`_rQAzBfbkj8C%&Z
ztFqP=bwOPMmcu-+3Tgp(2Dq&*3oKX{u|93()D+$sP}o+J(+S7$NgQXe!f9G1X&U+8
zlYsmfaXIKoh)L{mq#_`%@?{{jFkRdJkcOB@@G{J@hvNf>NdGqCZ7K;E6r{uDvl}n*
zMh*Z}o`k+n^?EQ*X$0w>P0??pltL0fEGhbqV;iKBFI2K`G(n;BP{%mvMiB>6$Um7)
zC$lV;4*w+FWb{VCLCgg{8YuU0alfm>UnNzI7qPy!{j(?uV~kf(Ek`-bqG+D;%~2Ye
zV_IH&Sld+ndDZ{r<jXr-%P6(bE5~^u*$f6?x&Wi&gUw)u!6@sbsm%Q5RUIbSG#4d9
z^#7vz;3oNbrYi`mv3hKm@f9qxt|L1zWj*-d#Ij_uWoLOme`51O;Fg46MJhi0VVrcH
z0kdtpG|?yi6kNxt?DYM5c!~=aZ-Q>3l5rHtsBx9gwLH-$E{{)Dd$_UbJlS&as(pXW
z*{D8$Qh6ka`Wv^p;jC95+^apQRyb8VwW?El{LtYoqSQoHTDB*j?zeEttCN4?J7ep~
z)z@0u>3Fem;1ryJW2fc4(hho~cBK7lj%h{V0oNMSLJjl|yunI*^DPeV_>xR3;eRkI
za(*3Ek}xvTdLfcfK)g<Kjr%aEK%6j};eKF7Z5h`pm)k<AAu%>;-{rC+y_)p2&%MsR
zei%hz<Z_Gaa!2W2WKdurjU9_FGHa<n-1WsGo3Tc7KayG{H8DB)x%Ga0;&B%&4PFHc
zl%7NJNJ*i&V&ze8-bWe9VH8w0l~J?!Wl&(|&=g-m*~waqC^SnL8Fe|W)Qpt^_L=O+
zsF-D}uB@)yxW4*TGP!wna^vje3z-zfRtwnZat#(sN}Y#K^jz*z-AfGkjz;zuGfU^d
s;-q-Gp8zXjoB@;jPl3ghyP?0|(RaC9ix&a%_($Q)&&o~VcQyCrzaL$#7XSbN

literal 0
HcmV?d00001

diff --git a/Barcode_Reader_Python/main.py b/Barcode_Reader_Python/main.py
index 8a2fd68..f01d2a2 100755
--- a/Barcode_Reader_Python/main.py
+++ b/Barcode_Reader_Python/main.py
@@ -5,10 +5,23 @@ import imutils
 import time
 import cv2
 import database_actions
-
+import datetime
+import generate_moves
 
 # initialize the video stream and allow the camera sensor to warm up
 print("[INFO] starting video stream...")
+def dateStr():
+    date_cur = ""
+    if len(str(datetime.date.today().day)) == 1:
+        date_cur = date_cur + "0" + str(datetime.date.today().day) + "."
+    else:
+        date_cur = date_cur + str(datetime.date.today().day) + "."
+    if len(str(datetime.date.today().month)) == 1:
+        date_cur = date_cur + "0" + str(datetime.date.today().month) + "."
+    else:
+        date_cur = date_cur + str(datetime.date.today().month) + "."
+    date_cur += str(datetime.date.today().year)
+    return date_cur
 # vs = VideoStream(src=0).start()
 vs = VideoStream().start()
 time.sleep(2.0)
@@ -17,8 +30,9 @@ reps = 0
 barcodes = None
 prevcode = None
 exp_date = []
+current_date =   dateStr()
 
-
+print current_date
 # loop over the frames from the video stream
 while reps<1:
     # grab the frame from the threaded video stream and resize it to
@@ -58,5 +72,7 @@ while reps<1:
 # close the output CSV file do a bit of cleanup
 print("[INFO] cleaning up...")
 print dates
+generate_moves.generate(dates,current_date)
+
 cv2.destroyAllWindows()
 vs.stop()
\ No newline at end of file
diff --git a/Barcode_Reader_Python/sort_date.py b/Barcode_Reader_Python/sort_date.py
index 786dc49..b8b3a59 100755
--- a/Barcode_Reader_Python/sort_date.py
+++ b/Barcode_Reader_Python/sort_date.py
@@ -1,117 +1,118 @@
-def dateComp(date_one,date_two):
-	date_one_id = date_one.split('.')
-	date_two_id = date_two.split('.')
-	if(int(date_one_id[2]) > int(date_two_id[2])):
-		return True
-	elif(int(date_one_id[2]) == int(date_two_id[2])):
-		if(int(date_one_id[1]) > int(date_two_id[1])):
-			return True
-		elif(int(date_one_id[1]) == int(date_two_id[1])):
-			if(int(date_one_id[0]) > int(date_two_id[0])):
-				return True
-			elif(int(date_one_id[0]) == int(date_two_id[0])):
-				return True
-	return False
-
-def addItem(list_bas,item,item_loc):
-	new_list = list_bas[0:item_loc]
-	new_list.append(item)
-	for i in range(len(list_bas) - item_loc):
-		new_list.append(list_bas[item_loc + i])
-	return new_list
-def expDate(current_date,prod_dates):
-	thrown_away = []
-	thrown_locs = []
-	thrown_number = 0
-	for i in range(len(prod_dates)):
-		if(dateComp(current_date,prod_dates[i])):
-			thrown_away.append(prod_dates[i])
-			thrown_locs.append(i)
-
-	for i in range(len(thrown_locs)):
-		prod_dates.pop(thrown_locs[i]-thrown_number)
-		thrown_number += 1
-
-def dateSort(current_date,prod_dates):
-	loc = None
-	sorted_dates = []
-	prev_placed = True
-
-	for i in range(len(prod_dates)):
-		if(dateComp(prod_dates[i],current_date)):
-			sorted_dates.append(prod_dates[i])
-			loc = i
-			break
-
-
-
-	for i in range(len(prod_dates)): 
-		if(loc == i): 
-			continue 
-		prev_placed = True
-		for j in range(len(sorted_dates)):
-			if(prev_placed):
-				if(j==0):
-					if(dateComp(sorted_dates[j],prod_dates[i])):
-						sorted_dates = addItem(sorted_dates,prod_dates[i],0)
-						prev_placed = False
-						continue
-				if(j == len(sorted_dates) - 1 ):
-					if(dateComp(prod_dates[i],sorted_dates[j])):
-						sorted_dates = addItem(sorted_dates,prod_dates[i],len(sorted_dates))
-					else:
-						sorted_dates = addItem(sorted_dates,prod_dates[i],len(sorted_dates)-1)
-					continue
-			
-				if(dateComp(prod_dates[i],sorted_dates[j])):
-					if(dateComp(sorted_dates[j+1],prod_dates[i])):
-						sorted_dates = addItem(sorted_dates,prod_dates[i],j+1)
-						prev_placed = False
-						continue
-				if(dateComp(sorted_dates[j],prod_dates[i])):
-					if(dateComp(prod_dates[i],sorted_dates[j-1])):
-						sorted_dates = addItem(sorted_dates,prod_dates[i],i)
-						prev_placed = False
-						continue
-
-	return sorted_dates
-
-def dateToint(sorted_dates,unsorted_dates,date_current):
-	date_num = 0
-	prev_date = None
-	sorted_dateInt = []
-	unsorted_dateInt = []
-
-	for i in range(len(sorted_dates)):
-		if(dateComp(date_current,sorted_dates[i])):
-			sorted_dateInt.append(-1)
-			continue
-		if(prev_date == sorted_dates[i]):
-			sorted_dateInt.append(date_num)
-			continue
-		date_num += 1
-		sorted_dateInt.append(date_num)
-		prev_date = sorted_dates[i]
-
-	for i in unsorted_dates:
-		unsorted_dateInt.append(sorted_dateInt[sorted_dates.index(i)])
-
-	return unsorted_dateInt
-
-def listDif(list1,list2):
-	listOrig = list1
-	for i in list2:
-		if(i in listOrig):
-			listOrig.pop(listOrig.index(i))
-
-	return listOrig
-
-
-def calcDate():
-	date_cur = '23.06.2018'
-	exp_dates = ['23.06.2019','22.06.2019','11.06.2018','24.06.2018','23.08.2018','23.04.2018']
-	exp_dates_process = exp_dates[:]
-	sorted_date = dateSort(date_cur,exp_dates_process)
-	date_int = dateToint(sorted_date,exp_dates,date_cur)
-	return date_int,sorted_date
-
+def dateComp(date_one, date_two):
+    date_one_id = date_one.split('.')
+    date_two_id = date_two.split('.')
+    if int(date_one_id[2]) > int(date_two_id[2]):
+        return True
+    elif int(date_one_id[2]) == int(date_two_id[2]):
+        if int(date_one_id[1]) > int(date_two_id[1]):
+            return True
+        elif int(date_one_id[1]) == int(date_two_id[1]):
+            if int(date_one_id[0]) > int(date_two_id[0]):
+                return True
+            elif int(date_one_id[0]) == int(date_two_id[0]):
+                return True
+    return False
+
+
+def addItem(list_bas, item, item_loc):
+    new_list = list_bas[0:item_loc]
+    new_list.append(item)
+    for i in range(len(list_bas) - item_loc):
+        new_list.append(list_bas[item_loc + i])
+    return new_list
+
+
+def expDate(current_date, prod_dates):
+    thrown_away = []
+    thrown_locs = []
+    thrown_number = 0
+    for i in range(len(prod_dates)):
+        if dateComp(current_date, prod_dates[i]):
+            thrown_away.append(prod_dates[i])
+            thrown_locs.append(i)
+
+    for i in range(len(thrown_locs)):
+        prod_dates.pop(thrown_locs[i] - thrown_number)
+        thrown_number += 1
+
+
+def dateSort(current_date, prod_dates):
+    loc = None
+    sorted_dates = []
+    prev_placed = True
+
+    for i in range(len(prod_dates)):
+        if dateComp(prod_dates[i], current_date):
+            sorted_dates.append(prod_dates[i])
+            loc = i
+            break
+
+    for i in range(len(prod_dates)):
+        if (loc == i):
+            continue
+        prev_placed = True
+        for j in range(len(sorted_dates)):
+            if prev_placed:
+                if j == 0:
+                    if dateComp(sorted_dates[j], prod_dates[i]):
+                        sorted_dates = addItem(sorted_dates, prod_dates[i], 0)
+                        prev_placed = False
+                        continue
+                if j == len(sorted_dates) - 1:
+                    if dateComp(prod_dates[i], sorted_dates[j]):
+                        sorted_dates = addItem(sorted_dates, prod_dates[i], len(sorted_dates))
+                    else:
+                        sorted_dates = addItem(sorted_dates, prod_dates[i], len(sorted_dates) - 1)
+                    continue
+
+                if dateComp(prod_dates[i], sorted_dates[j]):
+                    if dateComp(sorted_dates[j + 1], prod_dates[i]):
+                        sorted_dates = addItem(sorted_dates, prod_dates[i], j + 1)
+                        prev_placed = False
+                        continue
+                if dateComp(sorted_dates[j], prod_dates[i]):
+                    if dateComp(prod_dates[i], sorted_dates[j - 1]):
+                        sorted_dates = addItem(sorted_dates, prod_dates[i], i)
+                        prev_placed = False
+                        continue
+
+    return sorted_dates
+
+
+def dateToint(sorted_dates, unsorted_dates, date_current):
+    date_num = 0
+    prev_date = None
+    sorted_dateInt = []
+    unsorted_dateInt = []
+
+    for i in range(len(sorted_dates)):
+        if (dateComp(date_current, sorted_dates[i])):
+            sorted_dateInt.append(-1)
+            continue
+        if (prev_date == sorted_dates[i]):
+            sorted_dateInt.append(date_num)
+            continue
+        date_num += 1
+        sorted_dateInt.append(date_num)
+        prev_date = sorted_dates[i]
+
+    for i in unsorted_dates:
+        unsorted_dateInt.append(sorted_dateInt[sorted_dates.index(i)])
+
+    return unsorted_dateInt
+
+
+def listDif(list1, list2):
+    listOrig = list1
+    for i in list2:
+        if i in listOrig:
+            listOrig.pop(listOrig.index(i))
+
+    return listOrig
+
+
+def calcDate(exp_dates, date_cur):
+    exp_dates_process = exp_dates[:]
+    sorted_date = dateSort(date_cur, exp_dates_process)
+    date_int = dateToint(sorted_date, exp_dates, date_cur)
+    return date_int
diff --git a/Barcode_Reader_Python/sort_date.pyc b/Barcode_Reader_Python/sort_date.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..56c12b2c2d58f0d6984c24afe0073bfd44b9dcd8
GIT binary patch
literal 3507
zcmcImU2hvz5S_cW*Kw#zKS|xsfK*{As8In4fe@57D)c2Sn@W~I)ynlQ$tKS3diSPD
zAbDzqc;h!zNIWC)4=SE`;J+YRi8nZBcI|9J#8YB>$M<7)?wvVj=HA+0?di{do%?zq
z<;URv7M}bLL?H4^<SR6cHjD(0HXI3R+NeoT*G64}hBg`!xY}?fXv$J|3U&q#M7?}y
zIR6`BM`Tq^KQ*%J$d0LWYhsP;U>Qd`m}Un{6`i%ZWVgjSvh+VXj$|*#HfmKHMTa)N
zui7|Fr)r~KwNZ3v<M*nK!*pQdPt_T{lvu>p5RwL*U&P);ZbXbs#Abv?x(t%#e4Y*?
z3vEoq)^hk^wh`*o-Tp8S3rz+$=-bdw;?Pbyb~CZBRc8Ds*z02w{Vt|OMgA#T^DD`E
zIKLe&M?o^5X31(eu=#w?yYGML&EM{4gCq!jFYE_l=0DiBD@i<`Cz<uR_KkFVvh<x~
zJ*6}GMcOy7<2!5Wc&c*R4CoiV<fD9ehz9roo&oeXcWZ<j<NzmtzS(+@Py%tNpbwP`
z_*-~%Np|aFO(<i&E;Hnd8Qqi~Oe}R7-^C)fT-3S{{WJ~ZKx3Kp<K<ApJPcz6MtvDZ
zx%D6Sa}9iC!*v~H!yhIC?Zn}xPc_9cI^uXXxyvB9hXqfgnNLHAY2$mvbd07G9hrph
zCv=vDSwx9UK}OYOYf&s*M!+<T8nTaMw^2qCqdN`I8Wg?G;H@I+<q#rB05H%{07lmZ
zzuwk|V}msgtHJ9ui1$_%2^s_lgva0?8T$b?GI}DtK!64zD9}*OYrs8H)jL7aqM)ye
zNSdTwdTBW~*vPUlE*NL20+t5Kzg)R(SF&U?_WPUt?P?!r<+e>D#eBT6{y5A$2K5*q
z3%Ak*WJCwn^K%elT>W;;S##Q)b2{dH0Uq(?queJ)5uFKm0F2;$L6{JT3V81;cnEX>
z6SJWJ4_GM(iYG(gpt%QQ*nTtrG4+cfY{-~~tii?)GD@{R6>I-Eeqj&i@64{t{K}ro
z4obVx*Io%S1Wdt5XUrW~!!UFwbb|8J8fj^p^lbE8Mz6RS-lBiH2AFbz8(B8ASo&8O
zrjMVQeHJIL6?S3q@M&6|sIdGVX8VOMscS)hrs@c$s*cccXdHCrg(*!J`>h1xvU6}n
z?nqOv<Loz$L^}|pjx)OKFj&u}2Xu;hb})mcz#^=Hw89bKarUr$^3HIAYF*OKBRReE
z5SnN#Y0NQ}^st&#X%;^5(_w!Q2AVRKwSD!76Net~99hEZZ*v!SA<E1_#xQeSGlkZP
zGM8MmX3QJtwIFBAHD}hi&WyQaF6tOtoIU3Z7!TT?6v{u)VR1x>M8?&%TsBm?vh{4=
zDWlabmEES2RL`EBW>GGCOdAwDfXPBPno~A|Ti`TQ$m4HIm4e-46)amrMFdau{c^H=
zjj1t*BHJbZ7aq-WX)un36{(8ALpHf!al-u!M!2Y{3cj9j(LeYUg_U*F;~{()8}#Ih
z;vn48+nIM6diEs5M!b&#<OGrN%i=pZ=6#e=%VMnrp^Cm<dHEhLEvF7z#NcsMUT%bY
zc$na-<e`(l1u?F@u5zdiKAghw>6&TClTO=Qb@Uiz^!R8czJ&$?jnau5hk`Iis<4td
zvgS(G)^k#?8mp*L<LYQeZNaYxt)(t=WKr)O-dQxgS%|%R9j^>G6#%y0o!mC=XVLO;
z1c&L)l@_9J$dU3U;UWkp%#|VpOpZwi-a!W;xQZCy?!Zz8jyqbs)nUwGkfjQ=tnYXC
z8s7Do!o@|3xZp%A59x85lT4Q9?_|oyQ9cOs;vBDVXpe5d^%#oIpg$ZefHxU7lXH7w
znz*o@F^ff!<o=7o$phV+c<0TrdlO=BQ`$PRtMtd~Nw6^tKhdi+v#@olHPt%VnrqFp
GTK@t+f46P`

literal 0
HcmV?d00001