small changes

src/Modules/Pages.php

@@ -9,53 +9,58 @@ namespace Modules;
 
 class Pages extends BaseController
 {
-    public function Login($f3)
-    {
-        if ($this->isLogged)
-            $f3->reroute('/homemenu');
-        else
-            $f3->set('CONTENT', 'login.tpl');
-
-        echo \Template::instance()->render('masterpage.tpl');
-    }
+  public function Login($f3)
+  {
+    if ($this->isLogged)
+      $f3->reroute('/homemenu');
+    else
+      $f3->set('CONTENT', 'login.tpl');
 
-    public function HomeMenu($f3)
-    {
-        $f3->set('CONTENT', 'homemenu.tpl');
-        echo \Template::instance()->render('masterpage.tpl');
-    }
+    echo \Template::instance()->render('masterpage.tpl');
+  }
 
-    public function Pick2Light(object $f3, array $args)
-    {
-      switch ($args['step']) {
-        case 3:
-          $f3->set("INFOTEXT", "Aggancia l'etichetta elettronica al carrello e scannerizza il barcode");
-          break;
-      }
-
-      $f3->set('DISTINTE', $f3->Get('DB')->exec('SELECT DISTINCT commessa FROM distinte'));
-      $f3->set('STEP', $args['step']);
-      $f3->set('CONTENT', 'pick2light.tpl');
-        echo \Template::instance()->render('masterpage.tpl');
-    }
+  public function HomeMenu($f3)
+  {
+    $f3->set('CONTENT', 'homemenu.tpl');
+    echo \Template::instance()->render('masterpage.tpl');
+  }
 
-    public function Bind($f3, $args)
-    {
-        if($args['step']>2)
-        {
-            $f3->set("INFOTEXT", "Step 3 non ancora implementato");
-            $args['step'] = 2;
-        }
-
-        $f3->set('STEP', $args['step']);
-        $f3->set('CONTENT', 'bind.tpl');
-        $f3->set('AUTOFOCUS' . $args['step'], 'autofocus');
-        echo \Template::instance()->render('masterpage.tpl');
+  public function Pick2Light(object $f3, array $args)
+  {
+    switch ($args['step']) {
+      case 2:
+        $f3->set('SESSION.commessa', $f3->get('POST.commessa'));
+        break;
+      case 3;
+        $f3->set('SESSION.labelid', $f3->get('POST.labelid'));
+        break;
+      case 4:
+        $f3->set("INFOTEXT", "Aggancia l'etichetta elettronica al carrello e scannerizza il barcode");
+        break;
     }
 
-    public function ElencoDistinta($f3)
-    {
-        $f3->set('CONTENT', 'distinta.tpl');
-        echo \Template::instance()->render('masterpage.tpl');
+    $f3->set('DISTINTE', $f3->Get('DB')->exec('SELECT DISTINCT commessa FROM distinte'));
+    $f3->set('STEP', $args['step']);
+    $f3->set('CONTENT', 'pick2light.tpl');
+    echo \Template::instance()->render('masterpage.tpl');
+  }
+
+  public function Bind($f3, $args)
+  {
+    if ($args['step'] > 2) {
+      $f3->set("INFOTEXT", "Step 3 non ancora implementato");
+      $args['step'] = 2;
     }
+
+    $f3->set('STEP', $args['step']);
+    $f3->set('CONTENT', 'bind.tpl');
+    $f3->set('AUTOFOCUS' . $args['step'], 'autofocus');
+    echo \Template::instance()->render('masterpage.tpl');
+  }
+
+  public function ElencoDistinta($f3)
+  {
+    $f3->set('CONTENT', 'distinta.tpl');
+    echo \Template::instance()->render('masterpage.tpl');
+  }
 }

ui/pick2light.tpl

@@ -5,17 +5,22 @@
         <form class="form" method="post" action="{{@BASEURL}}/pick2light/{{@STEP+1}}">
             <input type="submit" hidden id="submitform"/>
 
-            <select class="form-control form-control-lg bg-secondary mb-3" onchange="javascript:{$('#submitform').click()}">
+            <select name="commessa" class="form-control form-control-lg bg-secondary mb-3" onchange="javascript:{$('#submitform').click()}">
                 <option selected>Seleziona una distinta</option>
                 <repeat group="{{ @DISTINTE }}" value="{{ @DISTINTA }}">
-                    <option>{{@@DISTINTA.commessa}}</option>
+                    <option value="{{@@DISTINTA.commessa}}">{{@@DISTINTA.commessa}}</option>
                 </repeat>
             </select>
 
             <check if="{{ @STEP > 1}}">
-                <input type="text" name="pickedcode" class="form-control form-control-lg" placeholder="Pick to code" required autofocus autocomplete="false"/>
+                <input type="text" name="labelid" value="{{@LABELID}}" class="form-control form-control-lg" placeholder="Etichetta da associare al carrello" required autofocus autocomplete="false"/>
             </check>
+            <check if="{{ @STEP > 2}}">
+                <input type="text" name="cartcode" value="{{@CARTCODE}}" class="form-control form-control-lg" placeholder="Etichetta da associare al carrello" required autofocus autocomplete="false"/>
+            </check>
+
         </form>
+
         <check if="{{@INFOTEXT}}">
             <div class="alert alert-danger mt-5" role="alert">
                 {{@INFOTEXT}}