Browse Source

* UPD: db schema

Giancarlo Voci 8 years ago
parent
commit
bd9bf5d758
2 changed files with 58 additions and 112 deletions
  1. 28 108
      .idea/workspace.xml
  2. 30 4
      omlink.sql

+ 28 - 108
.idea/workspace.xml

@@ -3,13 +3,6 @@
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="13e5f013-e4b6-4dea-8a5b-303c9372ca73" name="Default" comment="* UPD: db schema file&#10;* ADD: forced autofocus in bind and ventilazione">
     <list default="true" id="13e5f013-e4b6-4dea-8a5b-303c9372ca73" name="Default" comment="* UPD: db schema file&#10;* ADD: forced autofocus in bind and ventilazione">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.js" beforeDir="false" afterPath="$PROJECT_DIR$/build.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ui/css/omlink.css" beforeDir="false" afterPath="$PROJECT_DIR$/ui/css/omlink.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ui/css/omlink.scss" beforeDir="false" afterPath="$PROJECT_DIR$/ui/css/omlink.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ui/js/omlink.js" beforeDir="false" afterPath="$PROJECT_DIR$/ui/js/omlink.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/watcher.js" beforeDir="false" afterPath="$PROJECT_DIR$/watcher.js" afterDir="false" />
     </list>
     </list>
     <ignored path="ui/css/omlink.css" />
     <ignored path="ui/css/omlink.css" />
     <ignored path="ui/css/omlink.css.map" />
     <ignored path="ui/css/omlink.css.map" />
@@ -44,8 +37,8 @@
     <session id="563863937">
     <session id="563863937">
       <usages-collector id="statistics.lifecycle.project">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
         <counts>
-          <entry key="project.closed" value="35" />
-          <entry key="project.open.time.0" value="6" />
+          <entry key="project.closed" value="37" />
+          <entry key="project.open.time.0" value="7" />
           <entry key="project.open.time.1" value="1" />
           <entry key="project.open.time.1" value="1" />
           <entry key="project.open.time.10" value="6" />
           <entry key="project.open.time.10" value="6" />
           <entry key="project.open.time.11" value="7" />
           <entry key="project.open.time.11" value="7" />
@@ -56,10 +49,10 @@
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.16" value="1" />
           <entry key="project.open.time.18" value="1" />
           <entry key="project.open.time.18" value="1" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.2" value="1" />
-          <entry key="project.open.time.7" value="2" />
+          <entry key="project.open.time.7" value="3" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.8" value="2" />
           <entry key="project.open.time.9" value="6" />
           <entry key="project.open.time.9" value="6" />
-          <entry key="project.opened" value="40" />
+          <entry key="project.opened" value="42" />
         </counts>
         </counts>
       </usages-collector>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
       <usages-collector id="statistics.file.extensions.open">
@@ -72,7 +65,7 @@
           <entry key="htm" value="1" />
           <entry key="htm" value="1" />
           <entry key="ico" value="2" />
           <entry key="ico" value="2" />
           <entry key="ini" value="69" />
           <entry key="ini" value="69" />
-          <entry key="js" value="79" />
+          <entry key="js" value="80" />
           <entry key="json" value="10" />
           <entry key="json" value="10" />
           <entry key="log" value="5" />
           <entry key="log" value="5" />
           <entry key="md" value="1" />
           <entry key="md" value="1" />
@@ -93,7 +86,7 @@
           <entry key="Image" value="2" />
           <entry key="Image" value="2" />
           <entry key="Ini" value="69" />
           <entry key="Ini" value="69" />
           <entry key="JSON" value="10" />
           <entry key="JSON" value="10" />
-          <entry key="JavaScript" value="80" />
+          <entry key="JavaScript" value="81" />
           <entry key="Markdown" value="1" />
           <entry key="Markdown" value="1" />
           <entry key="PHP" value="673" />
           <entry key="PHP" value="673" />
           <entry key="PLAIN_TEXT" value="20" />
           <entry key="PLAIN_TEXT" value="20" />
@@ -155,35 +148,7 @@
     <favorites_list name="lamborghini" />
     <favorites_list name="lamborghini" />
   </component>
   </component>
   <component name="FileEditorManager">
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/watcher.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="4" column="21" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/build.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="299">
-              <caret line="34" column="3" lean-forward="true" selection-start-line="34" selection-start-column="3" selection-end-line="34" selection-end-column="3" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/ui/js/omlink.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="715">
-              <caret line="92" selection-start-line="92" selection-end-line="92" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   </component>
   <component name="FileTemplateManagerImpl">
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
     <option name="RECENT_TEMPLATES">
@@ -396,7 +361,6 @@
       <foldersAlwaysOnTop value="true" />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     </navigator>
     <panes>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
       <pane id="ProjectPane">
         <subPane>
         <subPane>
           <expand>
           <expand>
@@ -404,27 +368,11 @@
               <item name="omlink" type="b2602c69:ProjectViewProjectNode" />
               <item name="omlink" type="b2602c69:ProjectViewProjectNode" />
               <item name="omlink" type="462c0819:PsiDirectoryNode" />
               <item name="omlink" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
-            <path>
-              <item name="omlink" type="b2602c69:ProjectViewProjectNode" />
-              <item name="omlink" type="462c0819:PsiDirectoryNode" />
-              <item name="ui" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="omlink" type="b2602c69:ProjectViewProjectNode" />
-              <item name="omlink" type="462c0819:PsiDirectoryNode" />
-              <item name="ui" type="462c0819:PsiDirectoryNode" />
-              <item name="css" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="omlink" type="b2602c69:ProjectViewProjectNode" />
-              <item name="omlink" type="462c0819:PsiDirectoryNode" />
-              <item name="ui" type="462c0819:PsiDirectoryNode" />
-              <item name="js" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           </expand>
           <select />
           <select />
         </subPane>
         </subPane>
       </pane>
       </pane>
+      <pane id="Scope" />
     </panes>
     </panes>
   </component>
   </component>
   <component name="PropertiesComponent">
   <component name="PropertiesComponent">
@@ -436,7 +384,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="com.intellij.database.dataSource.DataSourceTemplate" value="DDL Data Source&#10;MySQL" />
     <property name="com.intellij.database.dataSource.DataSourceTemplate" value="DDL Data Source&#10;MySQL" />
     <property name="database.console.LAST_STATE" value="false" />
     <property name="database.console.LAST_STATE" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/node_modules/.bin/sass.cmd" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../maxmara" />
     <property name="list.type.of.created.stylesheet" value="SCSS" />
     <property name="list.type.of.created.stylesheet" value="SCSS" />
     <property name="nodejs_interpreter_path" value="node" />
     <property name="nodejs_interpreter_path" value="node" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
@@ -473,36 +421,10 @@
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
-  <component name="RunManager" selected="npm.Make Bundles - Dimatec">
+  <component name="RunManager">
     <configuration default="true" type="PhpRemoteDebugRunConfigurationType" factoryName="PHP Remote Debug" filter_connections="NOT_FILTER" server_name="Gedec" session_id="PHPSTORM">
     <configuration default="true" type="PhpRemoteDebugRunConfigurationType" factoryName="PHP Remote Debug" filter_connections="NOT_FILTER" server_name="Gedec" session_id="PHPSTORM">
       <method v="2" />
       <method v="2" />
     </configuration>
     </configuration>
-    <configuration name="Make Bundles - Dimatec" type="js.build_tools.npm" factoryName="npm">
-      <package-json value="$PROJECT_DIR$/package.json" />
-      <command value="run" />
-      <scripts>
-        <script value="build" />
-      </scripts>
-      <arguments value="dimatec" />
-      <node-interpreter value="node" />
-      <envs />
-      <method v="2" />
-    </configuration>
-    <configuration name="Make Bundles - Lamborghini" type="js.build_tools.npm" factoryName="npm">
-      <package-json value="$PROJECT_DIR$/package.json" />
-      <command value="run" />
-      <scripts>
-        <script value="build" />
-      </scripts>
-      <arguments value="lamborghini" />
-      <node-interpreter value="node" />
-      <envs />
-      <method v="2" />
-    </configuration>
-    <list>
-      <item itemvalue="npm.Make Bundles - Dimatec" />
-      <item itemvalue="npm.Make Bundles - Lamborghini" />
-    </list>
   </component>
   </component>
   <component name="StructureViewFactory">
   <component name="StructureViewFactory">
     <option name="ACTIVE_ACTIONS" value=",VISIBILITY_SORTER" />
     <option name="ACTIVE_ACTIONS" value=",VISIBILITY_SORTER" />
@@ -625,6 +547,8 @@
       <workItem from="1539348500105" duration="1609000" />
       <workItem from="1539348500105" duration="1609000" />
       <workItem from="1539587572816" duration="17000" />
       <workItem from="1539587572816" duration="17000" />
       <workItem from="1539587646794" duration="9954000" />
       <workItem from="1539587646794" duration="9954000" />
+      <workItem from="1539610655627" duration="189000" />
+      <workItem from="1539610987918" duration="3000" />
     </task>
     </task>
     <task id="LOCAL-00020" summary="* added method for sanitizing POST in all application">
     <task id="LOCAL-00020" summary="* added method for sanitizing POST in all application">
       <created>1525364690126</created>
       <created>1525364690126</created>
@@ -973,7 +897,7 @@
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1348587000" />
+    <option name="totallyTimeSpent" value="1348779000" />
   </component>
   </component>
   <component name="TodoView">
   <component name="TodoView">
     <todo-panel id="selected-file">
     <todo-panel id="selected-file">
@@ -989,13 +913,13 @@
     <layout>
     <layout>
       <window_info id="Favorites" order="0" sideWeight="0.50108224" side_tool="true" weight="0.20522387" />
       <window_info id="Favorites" order="0" sideWeight="0.50108224" side_tool="true" weight="0.20522387" />
       <window_info id="npm" order="1" sideWeight="0.4528302" side_tool="true" weight="0.22654584" />
       <window_info id="npm" order="1" sideWeight="0.4528302" side_tool="true" weight="0.22654584" />
-      <window_info content_ui="combo" id="Project" order="2" sideWeight="0.66065574" visible="true" weight="0.23294243" />
-      <window_info id="Structure" order="3" sideWeight="0.33934426" side_tool="true" visible="true" weight="0.23294243" />
+      <window_info content_ui="combo" id="Project" order="2" sideWeight="0.6577778" visible="true" weight="0.23827292" />
+      <window_info active="true" id="Structure" order="3" sideWeight="0.3422222" side_tool="true" visible="true" weight="0.23827292" />
       <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
       <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="1" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="1" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="2" sideWeight="0.50319827" side_tool="true" weight="0.31444445" />
       <window_info anchor="bottom" id="Event Log" order="2" sideWeight="0.50319827" side_tool="true" weight="0.31444445" />
       <window_info anchor="bottom" id="Terminal" order="3" sideWeight="0.49895832" weight="0.32792208" />
       <window_info anchor="bottom" id="Terminal" order="3" sideWeight="0.49895832" weight="0.32792208" />
-      <window_info active="true" anchor="bottom" id="Version Control" order="4" sideWeight="0.49946696" visible="true" weight="0.32222223" />
+      <window_info anchor="bottom" id="Version Control" order="4" sideWeight="0.49946696" weight="0.32222223" />
       <window_info anchor="bottom" id="Message" order="5" />
       <window_info anchor="bottom" id="Message" order="5" />
       <window_info anchor="bottom" id="Find" order="6" weight="0.32" />
       <window_info anchor="bottom" id="Find" order="6" weight="0.32" />
       <window_info anchor="bottom" id="Run" order="7" sideWeight="0.49733475" weight="0.27333334" />
       <window_info anchor="bottom" id="Run" order="7" sideWeight="0.49733475" weight="0.27333334" />
@@ -1472,10 +1396,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="400">
         <state relative-caret-position="400">
           <caret line="29" selection-start-line="29" selection-end-line="29" />
           <caret line="29" selection-start-line="29" selection-end-line="29" />
-          <folding>
-            <element signature="e#6#91#0#PHP" expanded="true" />
-            <element signature="e#119#130#0#PHP" expanded="true" />
-          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -1534,13 +1454,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/ui/js/omlink.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="715">
-          <caret line="92" selection-start-line="92" selection-end-line="92" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/ui/css/omlink.scss">
     <entry file="file://$PROJECT_DIR$/ui/css/omlink.scss">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="755">
         <state relative-caret-position="755">
@@ -1548,17 +1461,24 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/watcher.js">
+    <entry file="file://$PROJECT_DIR$/ui/js/omlink.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="4" column="21" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
+        <state relative-caret-position="1840">
+          <caret line="92" selection-start-line="92" selection-end-line="92" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/build.js">
     <entry file="file://$PROJECT_DIR$/build.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="34" column="3" lean-forward="true" selection-start-line="34" selection-start-column="3" selection-end-line="34" selection-end-column="3" />
+        <state relative-caret-position="409">
+          <caret line="34" column="3" selection-start-line="34" selection-start-column="3" selection-end-line="34" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/watcher.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="6" selection-start-column="6" selection-end-column="6" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>

+ 30 - 4
omlink.sql

@@ -11,6 +11,30 @@ DROP DATABASE IF EXISTS `omlink`;
 CREATE DATABASE `omlink` /*!40100 DEFAULT CHARACTER SET utf8mb4 */;
 CREATE DATABASE `omlink` /*!40100 DEFAULT CHARACTER SET utf8mb4 */;
 USE `omlink`;
 USE `omlink`;
 
 
+CREATE TABLE `distinte` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `idUtente` int(11) NOT NULL DEFAULT -1 COMMENT 'Utente che sta movimentando ',
+  `order` varchar(255) NOT NULL DEFAULT '' COMMENT 'Numero d''ordine/Commessa',
+  `barcode` varchar(255) NOT NULL DEFAULT '' COMMENT 'ESL Label id, lo stesso della tabella label_bindings',
+  `description` varchar(255) NOT NULL DEFAULT '',
+  `extracode` varchar(255) NOT NULL COMMENT 'Codice cliente',
+  `date` date NOT NULL DEFAULT current_timestamp(),
+  `time` time NOT NULL DEFAULT current_timestamp(),
+  `qta_to_move` int(11) NOT NULL DEFAULT 0 COMMENT 'Quantità da movimentare',
+  `qta_moved` int(11) NOT NULL DEFAULT 0 COMMENT 'Qunatità effettiva movimentata',
+  `status` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'stato movimentazione, impostare degli ENUM',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+CREATE TABLE `label_bindings` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `label_id` varchar(255) NOT NULL,
+  `barcode` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
 CREATE TABLE `notifications` (
 CREATE TABLE `notifications` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `code` int(11) NOT NULL DEFAULT 0,
   `code` int(11) NOT NULL DEFAULT 0,
@@ -20,6 +44,8 @@ CREATE TABLE `notifications` (
   PRIMARY KEY (`id`)
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
+INSERT INTO `notifications` (`id`, `code`, `caption`, `timestamp`, `link`) VALUES
+(2,	11,	'Errore: Servizio di FindBox non disponibile',	'2018-10-11 16:07:03',	'#');
 
 
 CREATE TABLE `queuesystem` (
 CREATE TABLE `queuesystem` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -33,13 +59,13 @@ CREATE TABLE `queuesystem` (
 CREATE TABLE `users` (
 CREATE TABLE `users` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `username` varchar(255) NOT NULL,
   `username` varchar(255) NOT NULL,
-  `saltedpassword` varchar(255) NOT NULL,
-  `roles` varchar(4096) NOT NULL DEFAULT '{}',
+  `saltedpassword` varchar(255) NOT NULL COMMENT 'password_hash("username|password", PASS',
+  `roles` varchar(4096) NOT NULL DEFAULT '{}' COMMENT 'PHP Serialized Array',
   PRIMARY KEY (`id`)
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
 INSERT INTO `users` (`id`, `username`, `saltedpassword`, `roles`) VALUES
 INSERT INTO `users` (`id`, `username`, `saltedpassword`, `roles`) VALUES
 (1,	'admin',	'$2y$10$Vd0Uv.h848Xj8HtuqMBO.OvSLp8ycQpSgveHb.bH4tl72iTCgpvay',	'a:1:{i:0;s:10:\"importdata\";}'),
 (1,	'admin',	'$2y$10$Vd0Uv.h848Xj8HtuqMBO.OvSLp8ycQpSgveHb.bH4tl72iTCgpvay',	'a:1:{i:0;s:10:\"importdata\";}'),
-(2,	'operatore1',	'$2y$10$Vd0Uv.h848Xj8HtuqMBO.OvSLp8ycQpSgveHb.bH4tl72iTCgpvay',	'a:1:{i:0;s:10:\"importdata\";}');
+(2,	'operatore1',	'$2y$10$Vd0Uv.h848Xj8HtuqMBO.OvSLp8ycQpSgveHb.bH4tl72iTCgpvay',	'a:1:{i:0;s:4:\"demo\";}');
 
 
--- 2018-10-10 15:28:40
+-- 2018-10-15 15:28:06