CAF199

assets/css/style.css

@@ -117,7 +117,7 @@ width: 72px;
     color:#EEE;
     width: 1270px;
     left: -5px;
-    bottom: -115px;
+    bottom: -74px;
     height: 105px;
     position: absolute;
 }
@@ -208,13 +208,13 @@ bottom: 4px;
 #keyboard-nav > div > span {font-size: 56px;}
 
 error-popins span.error_text {
-    font-size: 22px;
+    font-size: 20px;
     font-family: 'OpenSans';
     font-weight: inherit;
     left: -249px;
 }
 error-popins span.error_text.civ_text {top: -21px;font-size: 20px;}
-error-popins span.error_text.name_text {top: 85px;}
+error-popins span.error_text.name_text {top: 17px;}
 #keyboard-page{left:330px;top: 0;}
 #screensaver-icon {top: 23em !important;left: 56em;position: absolute;}
 #screensaver-page {padding-top: 0;}
@@ -424,7 +424,7 @@ font-family: 'OpenSansBold';
     background-size: 410px 89px;
     background-position-x: 5px;
     height: 82px;
-    top: 56px;
+    top: 0;
     width: 421px;
 }
 #lastname{
@@ -551,11 +551,11 @@ z-index: -1;
 }
 #firstname {
     left: inherit;
-    right: -78px;
+    left: 412px;
 }
 #lastname {
-    right: 339px;
-    left: inherit;
+    left: -6px;
+    /* left: inherit; */
 }
 #matricule{
     left: 830px;
@@ -694,7 +694,7 @@ z-index: -1;
 #errorName{
     position: absolute;
     left: -268px;
-    top: 71px;
+    top: 8px;
 }
 
 #errorCiv{
@@ -1102,3 +1102,7 @@ top: 569px !important;
     top: 447px;
   }
 }
+#keys{
+    
+top: 120px;
+}
\ No newline at end of file

assets/templates/borne/civilite-client.html

-<div class="civilite" ng-class="civilite.code" ng-repeat="civilite in caisse.civilites" ng-touchstart="caisse.setCivilite(civilite.code)">
+<div class="civilite" ng-class="civilite.code" ng-repeat="civilite in caisse.civilites" ng-touchstart="caisse.setCivilite(civilite.code)" ng-if="config.fields.GENDER.ENABLED">
 	<span class="civilite-radio" ng-class="(caisse.civilite==civilite.code)?'civilite-radio-selected':''">
 		<img ng-src="/assets/img/icons/borne/civilite.png" class="no-checked"/>
 		<img ng-src="/assets/img/icons/borne/civilite_checked.png" class="checked" />

assets/templates/borne/error-popins.html

@@ -5,9 +5,9 @@ style="enable-background:new 0 0 221.609 70.97;left: -220px;top: -15px;position:
 	<rect ng-style="{'fill': errorPopinColor }" rx="10" ry="10" width="179.075" height="70.97"/><polygon ng-style="{'fill': errorPopinColor }" points="199.249,35.485 176.302,48.733 176.302,22.236 "/>
 </svg>
 <img src="/assets/img/icons/borne/error_popin.png"  id="errorCiv" ng-show="clientcivilite && !caisse.civilite && config.borne.POPUP_ERRORS !== true  && caisse.config.fields.GENDER.REQUIRED">
-<img src="/assets/img/icons/borne/error_popin.png"  id="errorName" ng-show="((!caisse.lastname && caisse.config.fields.LASTNAME.REQUIRED) || (!caisse.firstname && caisse.config.fields.FIRSTNAME.REQUIRED)) && config.borne.POPUP_ERRORS !== true">
+<img src="/assets/img/icons/borne/error_popin.png"  id="errorName" ng-show="((!caisse.lastname && caisse.config.fields.LASTNAME.REQUIRED) || (!caisse.firstname && caisse.config.fields.FIRSTNAME.REQUIRED) || (!caisse.matricule && caisse.config.fields.MATRICULE.REQUIRED)) && config.borne.POPUP_ERRORS !== true">
 
 <span class="error_text civ_text" ng-if="clientcivilite && !caisse.civilite && !config.borne.POPUP_ERRORS && caisse.config.fields.GENDER.REQUIRED" ng-bind-html='titles.CIV_ERROR | sep2br'></span>
 <span class="error_text company_text" ng-if="clientcompany && !caisse.company && !config.borne.POPUP_ERRORS" ng-bind-html='titles.COMPANY_ERROR | sep2br'></span>
-<span class="error_text name_text" ng-if="((!caisse.lastname && caisse.config.fields.LASTNAME.REQUIRED) || (!caisse.firstname && caisse.config.fields.FIRSTNAME.REQUIRED)) && !config.borne.POPUP_ERRORS"  ng-bind-html='titles.NAME_ERROR | sep2br'></span>
+<span class="error_text name_text" ng-if="((!caisse.lastname && caisse.config.fields.LASTNAME.REQUIRED) || (!caisse.firstname && caisse.config.fields.FIRSTNAME.REQUIRED) || (!caisse.matricule && caisse.config.fields.MATRICULE.REQUIRED)) && !config.borne.POPUP_ERRORS"  ng-bind-html='titles.NAME_ERROR | sep2br'></span>
 <span class="error_text cgu_text" ng-if="(!caisse.cgu && caisse.config.fields.CGU.REQUIRED) && !config.borne.POPUP_ERRORS"  ng-bind-html='titles.CGU_ERROR | sep2br'></span>

bornes/assets/js/app.js

@@ -172,6 +172,7 @@ app.controller("CaisseController", ['$http', '$scope', '$controller', '$timeout'
     that.currentInput = $("#keyboard-page input:first").length ? $("#keyboard-page input:first")[0].id : "";
     that.company = '';
     that.firstname = '';
+    that.matricule = '';
     that.lastname = '';
     that.phone = '';
     that.cgu = 0;

inc/languages/fr.po

@@ -85,7 +85,7 @@ msgid "CIV_ERROR"
 msgstr "Veuillez sélectionner|votre civilité"
 
 msgid "NAME_ERROR"
-msgstr "Veuillez saisir vos|noms et prénoms"
+msgstr "Veuillez saisir votre|noms, prénom|et matricule"
 
 msgid "NFC_ERROR"
 msgstr "Désolé, vous n'avez pas été identifié(e)"
@@ -100,7 +100,7 @@ msgid "LASTNAME_PLACEHOLDER"
 msgstr "Nom (obligatoire)"
 
 msgid "MATRICULE_PLACEHOLDER"
-msgstr "Matricule (optionnel)"
+msgstr "Matricule (obligatoire)"
 
 msgid "VALIDATE"
 msgstr "Valider"

inc/settingsNetisse.php

@@ -203,8 +203,8 @@ $BORNE_CONF["FIELDS"]["COMPANY"] = array("ENABLED" => false, "REQUIRED" => false
 																	 
 $BORNE_CONF["FIELDS"]["FIRSTNAME"] = array("ENABLED" => true, "REQUIRED" => true);
 $BORNE_CONF["FIELDS"]["LASTNAME"] = array("ENABLED" => true, "REQUIRED" => true);
-$BORNE_CONF["FIELDS"]["MATRICULE"] = array("ENABLED" => true, "REQUIRED" => false);
-$BORNE_CONF["FIELDS"]["GENDER"] = array("ENABLED" => true, "REQUIRED" => true);
+$BORNE_CONF["FIELDS"]["MATRICULE"] = array("ENABLED" => true, "REQUIRED" => true);
+$BORNE_CONF["FIELDS"]["GENDER"] = array("ENABLED" => false, "REQUIRED" => false);
 $BORNE_CONF["FIELDS"]["COMPANY"] = array("ENABLED" => false, "REQUIRED" => false);
 $BORNE_CONF["FIELDS"]["PHONE"] = array("ENABLED" => false, "REQUIRED" => false);
 $BORNE_CONF["FIELDS"]["CGU"] = array("ENABLED" => false, "REQUIRED" => false);