CAFI193 CAFI195 CAFI196

assets/css/style.css

@@ -95,7 +95,7 @@ width: 72px;
 .srdv-page #page-title span {font-size: 56px;}
 .cons_item, .pagination-item.direction, .pagination > li.direction{background-color: #d51d1d;}
 .cons_item .lastname, .cons_item.myst .title {/* font-weight: bold; *//* font-size: 26px !important; */}
-.cons_item .lastname.bigname{font-size: 23px !important;}
+.cons_item .lastname.bigname{/* font-size: 23px !important; */}
 .cons_item .lastname.bigname2{font-size: 16px !important;}
 .cons_item .lastname.bigname3{font-size: 17px !important;}
 .cons_item .lastname.bigname4{font-size: 15px !important;}
@@ -254,7 +254,7 @@ right: 0;
 #cons-pagination {top: 650px;}
 .double-col-motifs .motif-item{/* padding: 10px 50px; */}
 nfc-page > div.nfc-infos {color: #09635D;font-size: 60px;top: 28px;position: relative;}
-.conseillerName {white-space: normal;line-height: 38px;width: 265px;/* font-weight: 700; */font-family: OpenSansSemiBold !important;/* word-wrap: break-word; */}
+.conseillerName {white-space: normal;line-height: 40px;width: 265px;/* font-weight: 700; */font-family: OpenSansSemiBold !important;/* word-wrap: break-word; */}
 .cons_item .lastname {text-transform: uppercase;display: inline-block;width: 265px;word-wrap: break-word;}
 .cons_item.myst .conseillerName{
     text-transform: inherit;

assets/templates/borne/conseiller-panel.html

 	<image width="174" height="149" ng-src="{{caisse.params.subfolder}}{{conseiller.photo}}" ng-hide="config.backoffice.TOGGLE_SHOW_PHOTOS && caisse.params.show_photos == 0"></image>
 	<div class="title">
 		<div class="conseillerName">
-			<span class="firstname" ng-class="{'bigname':(conseiller.prenom.length > 14 && conseiller.nom.length > 14) || (conseiller.prenom.length > 28 && conseiller.nom.length < 14)}">{{(currentLang == 'ar') ? conseiller.prenom_ar : conseiller.prenom}}</span>
+			<span class="firstname" ng-class="{'bigname':conseiller.id != 0 && conseiller.prenom.length > 14}">{{(currentLang == 'ar') ? conseiller.prenom_ar : conseiller.prenom}}</span>
 			<!-- <span class="lastname" ng-class="{'bigname':conseiller.nom.length>bignameLength, 'bigname2':conseiller.nom.length>=15, 'bigname-3':conseiller.nom.length>=18}">{{(currentLang == 'ar') ? conseiller.nom_ar : conseiller.nom}}</span><br/> -->
-			<br/><span class="lastname" ng-class="{'bigname':(conseiller.prenom.length > 14 && conseiller.nom.length > 14) || (conseiller.nom.length > 28 && conseiller.prenom.length < 14)}">{{(currentLang == 'ar') ? conseiller.nom_ar : conseiller.nom}}</span><br/> 
+			<br/><span class="lastname" ng-class="{'bigname':conseiller.id != 0 && conseiller.nom.length > 14}">{{(currentLang == 'ar') ? conseiller.nom_ar : conseiller.nom}}</span><br/> 
 		</div>
 		<span class="fonction" ng-if="getFunctionVisiblity(conseiller.fonction) == 1" ng-hide="conseiller.myst == 1"  ng-class="{'bigfunction':getFonction(conseiller.label_fonction,conseiller.fonction).length>23}">
 			{{getFonction(conseiller.label_fonction,conseiller.fonction)}}

bornes/assets/js/app.js

@@ -1272,14 +1272,14 @@ app.controller("CaisseController", ['$http', '$scope', '$controller', '$timeout'
                     }
                 }
                 if (msg.message) {
-                    waitMessage = msg.message.replace(/\\/g,"").replace("[CLIENT]", client).replace("[CONSEILLER]", "un conseiller");
+                    waitMessage = msg.message.replace(/\\/g,"").replace("[CLIENT]", client).replace("[CONSEILLER]", "un collaborateur");
                 }
                 break;
             case 1:
                 // RDV
                 if (that.currentConseiller == 0) {
                     var msg = $scope.getOrientationByEntite($scope.currentTab, 0);
-                    waitMessage = msg.message.replace("[CLIENT]", client).replace("[CONSEILLER]", "<span class='consName'>un conseiller</span>");
+                    waitMessage = msg.message.replace("[CLIENT]", client).replace("[CONSEILLER]", "<span class='consName'>un collaborateur</span>");
                 } else {
                     var cons = $scope.getConseillerByID(that.currentConseiller);
                     var showAgentfirstname = ($scope.borne.ORIENTATIONS.AGENT == undefined || $scope.borne.ORIENTATIONS.AGENT.prenom == undefined) ? true : $scope.borne.ORIENTATIONS.AGENT.prenom;
@@ -1310,7 +1310,7 @@ app.controller("CaisseController", ['$http', '$scope', '$controller', '$timeout'
                 // Meeting
                 msg = $scope.getOrientationByType(1);
                 if (msg.message) {
-                    waitMessage = msg.message.replace(/\\/g,"").replace("[CLIENT]", client).replace("[CONSEILLER]", "Un conseiller");
+                    waitMessage = msg.message.replace(/\\/g,"").replace("[CLIENT]", client).replace("[CONSEILLER]", "un collaborateur");
                 }
                 break;
         }