diff --git a/module/less/main.less b/module/less/main.less index b40140a6b436311103119befdb6d820f0f7d4df1..cfbf3a465262ac906dc7a0da53983fc2a47daf64 100755 --- a/module/less/main.less +++ b/module/less/main.less @@ -48,7 +48,7 @@ display : inline; background-color:#ffffff; cursor: pointer; - + } .box_number { @@ -74,20 +74,22 @@ text-transform: uppercase; text-align: center; } - -.box_waiting {background: #ffffff url("../../../images/sql_list/st1.gif") 2px 2px no-repeat;} -.box_error {background: #ffffff url("../../../images/sql_list/st2.png") 2px 2px no-repeat;} -.box_treated {background: #ffffff url("../../../images/sql_list/st3.png") 2px 2px no-repeat;} -.box_non_treatable {background: #ffffff url("../../../images/sql_list/st4.png") 2px 2px no-repeat;} -.box_processing {background: #ffffff url("../../../images/sql_list/st5.gif") 2px 2px no-repeat;} -.box_non_authorized {background: #ffffff url("../../../images/sql_list/st6.png") 2px 2px no-repeat;} +// Etat des demandes et messages. +.box-dot-waiting {background-color: #5ac6de;} +.box-dot-error {background-color: #ff0000;} +.box-dot-treated {background-color: #9cce29;} +.box-dot-non-treatable {background-color: #000000;} +.box-dot-non-authorized {background-color: #c6c6c6;} .box-dot-order-stopped {background-color: darkorange;} - -.box_enabled_subscription {background: #ffffff url("../../../images/sql_list/st3.png") 2px 2px no-repeat;} -.box_non_enabled_subscription {background: #ffffff url("../../../images/sql_list/st2.png") 2px 2px no-repeat;} - -.box_enabled_survey {background: #ffffff url("../../../images/sql_list/st3.png") 2px 2px no-repeat;} -.box_non_enabled_survey {background: #ffffff url("../../../images/sql_list/st2.png") 2px 2px no-repeat;} +// En cours (point clignotant). +.box-dot-processing {background-color: #f79cce; animation: blinking 1s linear infinite;} +@keyframes blinking {from, 49.9% {opacity: 0;} 50%, to {opacity: 1;}} +// Abonnements. +.box-dot-enabled-subscription {background-color: #9cce29;} +.box-dot-non-enabled-subscription {background-color: #ff0000;} +// Surveillances. +.box-dot-enabled-survey {background-color: #9cce29;} +.box-dot-non-enabled-survey {background-color: #ff0000;} // Point indiquant la couleur de la demande. .box-dot { @@ -97,4 +99,4 @@ width: 10px; margin: 3px; border-radius: 50%; -} \ No newline at end of file +} diff --git a/module/templates/supervisionStatusTpl.html b/module/templates/supervisionStatusTpl.html index 5c86739bd00d85e2e67ee58c7b5dd012a1c47143..7a31275f06dcc6ec55c4268fc7fdce122fa3931d 100755 --- a/module/templates/supervisionStatusTpl.html +++ b/module/templates/supervisionStatusTpl.html @@ -3,31 +3,37 @@ <div class="recap_title" data-translate="STATUS_TITLE_SUPERVISION_ORDER"></div> <div class="recap_boxes"> <div class="box_recap box_waiting" ng-click="setSupervisionRecapFilter(1)"> + <span class="box-dot box-dot-waiting"></span> <div class="box_number">{{oSupervisionStatus.order.iWaitingOrders}}</div> <div class="box_text" data-translate="WAITING_BOX_TITLE_SUPERVISION_ORDER"></div> </div> <div class="box_recap box_error" ng-click="setSupervisionRecapFilter(2)"> + <span class="box-dot box-dot-error"></span> <div class="box_number">{{oSupervisionStatus.order.iErrors}}</div> <div class="box_text" data-translate="ERROR_BOX_TITLE_SUPERVISION_ORDER"></div> </div> <div class="box_recap box_treated" ng-click="setSupervisionRecapFilter(3)"> + <span class="box-dot box-dot-treated"></span> <div class="box_number">{{oSupervisionStatus.order.iTreatedOrders}}</div> <div class="box_text" data-translate="TREATED_BOX_TITLE_SUPERVISION_ORDER"></div> </div> <div class="box_recap box_non_treatable" ng-click="setSupervisionRecapFilter(4)"> + <span class="box-dot box-dot-non-treatable"></span> <div class="box_number">{{oSupervisionStatus.order.iNonTreatableOrders}}</div> <div class="box_text" data-translate="NON_TREATABLE_BOX_TITLE_SUPERVISION_ORDER"></div> </div> <div class="box_recap box_processing" ng-click="setSupervisionRecapFilter(5)"> + <span class="box-dot box-dot-processing"></span> <div class="box_number">{{oSupervisionStatus.order.iProcessingOrders}}</div> <div class="box_text" data-translate="PROCESSING_BOX_TITLE_SUPERVISION_ORDER"></div> </div> <div class="box_recap box_non_authorized" ng-click="setSupervisionRecapFilter(6)"> + <span class="box-dot box-dot-non-authorized"></span> <div class="box_number">{{oSupervisionStatus.order.iNonAuthorizedOrders}}</div> <div class="box_text" data-translate="NON_AUTHORIZED_BOX_TITLE_SUPERVISION_ORDER"></div> </div> - <span class="box-dot box-dot-order-stopped"></span> <div class="box_recap box_stopped" ng-click="setSupervisionRecapFilter(7)"> + <span class="box-dot box-dot-order-stopped"></span> <div class="box_number">{{oSupervisionStatus.order.iStoppedOrders}}</div> <div class="box_text" data-translate="STOPPED_BOX_TITLE_SUPERVISION_ORDER"></div> </div> @@ -37,10 +43,12 @@ <div class="recap_title" data-translate="STATUS_TITLE_SUPERVISION_SUBSCRIPTION"></div> <div class="recap_boxes"> <div class="box_recap box_enabled_subscription" ng-click="setSupervisionRecapFilter('TRUE')"> + <span class="box-dot box-dot-enabled-subscription"></span> <div class="box_number">{{oSupervisionStatus.subscription.iEnabledSubscription}}</div> <div class="box_text" data-translate="ENABLED_SUBSCRIPTION_BOX_TITLE_SUPERVISION_SUBSCRIPTION"></div> </div> <div class="box_recap box_non_enabled_subscription" ng-click="setSupervisionRecapFilter('FALSE')"> + <span class="box-dot box-dot-non-enabled-subscription"></span> <div class="box_number">{{oSupervisionStatus.subscription.iNonEnabledSubscription}}</div> <div class="box_text" data-translate="NON_ENABLED_SUBSCRIPTION_BOX_TITLE_SUPERVISION_SUBSCRIPTION"></div> </div> @@ -50,10 +58,12 @@ <div class="recap_title" data-translate="STATUS_TITLE_SUPERVISION_SURVEY"></div> <div class="recap_boxes"> <div class="box_recap box_enabled_survey" ng-click="setSupervisionRecapFilter('TRUE')"> + <span class="box-dot box-dot-enabled-survey"></span> <div class="box_number">{{oSupervisionStatus.survey.iEnabledSurvey}}</div> <div class="box_text" data-translate="ENABLED_SURVEY_BOX_TITLE_SUPERVISION_SURVEY"></div> </div> <div class="box_recap box_non_enabled_survey" ng-click="setSupervisionRecapFilter('FALSE')"> + <span class="box-dot box-dot-non-enabled-survey"></span> <div class="box_number">{{oSupervisionStatus.survey.iNonEnabledSurvey}}</div> <div class="box_text" data-translate="NON_ENABLED_SURVEY_BOX_TITLE_SUPERVISION_SURVEY"></div> </div> @@ -63,18 +73,22 @@ <div class="recap_title" data-translate="STATUS_TITLE_SUPERVISION_MESSAGE"></div> <div class="recap_boxes"> <div class="box_recap box_waiting" ng-click="setSupervisionRecapFilter(1)"> + <span class="box-dot box-dot-waiting"></span> <div class="box_number">{{oSupervisionStatus.message.iWaitingMessages}}</div> <div class="box_text" data-translate="WAITING_BOX_TITLE_SUPERVISION_MESSAGE"></div> </div> <div class="box_recap box_error" ng-click="setSupervisionRecapFilter(2)"> + <span class="box-dot box-dot-error"></span> <div class="box_number">{{oSupervisionStatus.message.iErrorMessage}}</div> <div class="box_text" data-translate="ERROR_BOX_TITLE_SUPERVISION_MESSAGE"></div> </div> <div class="box_recap box_treated" ng-click="setSupervisionRecapFilter(3)"> + <span class="box-dot box-dot-treated"></span> <div class="box_number">{{oSupervisionStatus.message.iTreatedMessages}}</div> <div class="box_text" data-translate="TREATED_BOX_TITLE_SUPERVISION_MESSAGE"></div> </div> <div class="box_recap box_processing" ng-click="setSupervisionRecapFilter(5)"> + <span class="box-dot box-dot-processing"></span> <div class="box_number">{{oSupervisionStatus.message.iProcessingMessages}}</div> <div class="box_text" data-translate="PROCESSING_BOX_TITLE_SUPERVISION_MESSAGE"></div> </div>