CAFI161 CAFI162

assets/css/style.css

@@ -212,8 +212,8 @@ error-popins span.error_text {
     font-weight: inherit;
     left: -249px;
 }
-error-popins span.error_text.civ_text {top: 0px;}
-error-popins span.error_text.name_text {top: 70px;}
+error-popins span.error_text.civ_text {top: -8px;font-size: 20px;}
+error-popins span.error_text.name_text {top: 85px;}
 #keyboard-page{left:330px;top: 0;}
 #screensaver-icon {top: 23em !important;left: 56em;position: absolute;}
 #screensaver-page {padding-top: 0;}
@@ -419,7 +419,7 @@ font-family: 'OpenSansBold';
     background-color: transparent;
     background: url(/assets/img/icons/borne/keyboard_input.png) no-repeat;
     border: inherit;
-    background-size: 619px 89px;
+    background-size: 422px 89px;
     height: 82px;
     top: 56px;
     width: 428px;
@@ -691,7 +691,13 @@ z-index: -1;
 #errorName{
     position: absolute;
     left: -268px;
-    top: 53px;
+    top: 71px;
+}
+
+#errorCiv{
+    position: absolute;
+    left: -268px;
+    top: -32px;
 }
 #rdv-btn img,  #srdv-btn img {
     top: 21px;

assets/templates/borne/error-popins.html

@@ -4,14 +4,10 @@ width="221.609px" height="70.97px" viewBox="0 0 221.609 70.97"
 style="enable-background:new 0 0 221.609 70.97;left: -220px;top: -15px;position: absolute;" xml:space="preserve" ng-show="clientcompany && !caisse.company && config.borne.POPUP_ERRORS !== true">
 	<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>
-<svg version="1.1" id="errorCiv" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-width="221.609px" height="70.97px" viewBox="0 0 221.609 70.97"
-style="enable-background:new 0 0 221.609 70.97;left: -220px;top: -15px;position: absolute;" xml:space="preserve" ng-show="clientcivilite && !caisse.civilite && config.borne.POPUP_ERRORS !== true  && caisse.config.fields.GENDER.REQUIRED">
-	<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="errorName" ng-show="(caisse.company || caisse.civilite || !caisse.config.fields.GENDER.REQUIRED) && ((!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="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">
 
 <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.company || caisse.civilite || !caisse.config.fields.GENDER.REQUIRED) && ((!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)) && !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>

inc/settingsNetisse.php

@@ -84,7 +84,7 @@ $PILE_CONF["COLORS"]["SHIP"] = "#e5ab3d";
 $PILE_CONF["MAXDURATIONWAIT"] = 600;
 $PILE_CONF["KEEPALIVE"] = 15;
 $PILE_CONF["REINFORCEMENTDELAY"] = 30;
-//$PILE_CONF["DEFAULT_AGENT_STATUS"] = 0;
+$PILE_CONF["DEFAULT_AGENT_STATUS"] = -1;
 $PILE_CONF["AGENT_FORM"] = true;
 $PILE_CONF["LABEL_NOTIFS"] = "Je suis en charge de l'accueil";
 $PILE_CONF["LABEL_NOTIFS"] = 'Recevoir les notifications';
@@ -136,7 +136,7 @@ $BORNE_CONF["NFC"] = true;
 $BORNE_CONF["HELP"] = false;
 $BORNE_CONF["MULTIPLEMOTIFS"] = false;
 $BORNE_CONF["DETACHED_UNKOWN_AGENT"] = false;
-$BORNE_CONF["DEFAULT_CIVILITY"] = "Mme";
+$BORNE_CONF["DEFAULT_CIVILITY"] = "";
 $BORNE_CONF["MERGEENTITIES"] = true;
 $BORNE_CONF["CUSTOM_CIV_ICONS"] = true;
 $BORNE_CONF["GLOBAL_NAV_ICONS_PATH"] = '/assets/img/icons/borne';