SAK-44029 remove static timer warning that used the autosave time (sa…

…kaiproject#8757)

* SAK-44029 remove static timer warning that used the autosave time and replace with warning about when assessment will be due/retracted

* remove old translations

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties

@@ -248,7 +248,7 @@ selection_level_feed=Selection-level Feedback
 time_expired1=Time Expired!
 time_expired2=The time allowed for this assessment has expired. Your answers will be automatically submitted momentarily.
 time_expired3=All of your answers are being submitted
-time_left=You have {0} minutes and {1} seconds left
+time_left=You have until {0} to complete this assessment. Please save and submit your work.
 time_up=Time's up
 hide_show=Hide/Show Time Remaining
 session_will_timeout=Your session will expire in 5 minutes. Click OK to renew.

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_ar.properties

@@ -246,7 +246,6 @@ selection_level_feed=Selection-level Feedback
 time_expired1=Time Expired\!
 time_expired2=The time allowed for this assessment has expired. Your answers will be automatically submitted momentarily.
 time_expired3=All of your answers are being submitted
-time_left=You have {0} minutes and {1} seconds left
 time_up=Time's up
 hide_show=Hide/Show Time Remaining
 session_will_timeout=Your session will expire in 5 minutes. Click OK to renew.

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_ca.properties

@@ -246,7 +246,6 @@ selection_level_feed=Comentari a nivell de selecci\u00f3
 time_expired1=Els temps s'ha exhaurit.
 time_expired2=El temps disponible per a aquesta prova s'ha exhaurit. Les vostres respostes de moment s'han enviat autom\u00e0ticament.
 time_expired3=S'estan enviant les seves respostes
-time_left=Us queden {0} minuts i {1} segons
 time_up=El temps s'ha exhaurit
 hide_show=Amaga/mostra el temps restant
 session_will_timeout=La vostra sessi\u00f3 caducar\u00e0 en 5 minuts. Feu clic sobre OK per renovar-la.

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_de_DE.properties

@@ -246,7 +246,6 @@ selection_level_feed=Feedback zur Auswahl
 time_expired1=Zeit abgelaufen\!
 time_expired2=Die f\u00fcr diese Beurteilung zul\u00e4ssige Zeit ist abgelaufen. Ihre Antworten wurden automatisch eingereicht.
 time_expired3=Alle Antworten werden eingereicht
-time_left=You have {0} minutes and {1} seconds left
 time_up=Time's up
 hide_show=Restliche Zeit ausblenden/einblenden
 session_will_timeout=Ihre Session l\u00e4uft in 5 Minuten ab. Klicken Sie auf OK, um eine Aktualisierung vorzunehmen.

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_es.properties

@@ -246,7 +246,6 @@ selection_level_feed=Selecci\u00f3n - nivel de comentario
 time_expired1=\u00a1Tiempo Expirado\!
 time_expired2=Ha expirado el tiempo permitido para realizar este examen. Sus respuestas ser\u00e1n enviadas a continuaci\u00f3n de forma autom\u00e1tica.
 time_expired3=Todas sus respuestas est\u00e1n siendo enviadas
-time_left=Le quedan {0} minutos y {1} segundos
 time_up=Se acab\u00f3 el tiempo
 hide_show=Ocultar/Mostrar el tiempo restante
 session_will_timeout=Su sesi\u00f3n terminar\u00e1 en 5 minutos. Pulse "Aceptar" para renovarla.

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_fr_FR.properties

@@ -246,7 +246,6 @@ selection_level_feed=R\u00e9troaction au niveau de la s\u00e9lection
 time_expired1=Le temps est expir\u00e9\!
 time_expired2=The time allowed for this assessment has expired. Your answers will be automatically submitted momentarily.
 time_expired3=Toutes vos r\u00e9ponses sont en train d'\u00eatre remises
-time_left=You have {0} minutes and {1} seconds left
 time_up=Time's up
 hide_show=Cacher/Montrer Temps Restant
 session_will_timeout=Votre session expirera dans 5 minutes. Cliquez OK pour renouveler.

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_tr_TR.properties

@@ -245,7 +245,6 @@ selection_level_feed=Se\u00e7im Seviyesi geri bildirimi
 time_expired1=S\u00fcre Doldu\!
 time_expired2=Bu s\u0131nav i\u00e7in izin verilen s\u00fcre dolmu\u015ftur. Cevaplar\u0131n\u0131z anl\u0131k ve otomatik olarak g\u00f6nderilmi\u015ftir.
 time_expired3=T\u00fcm cevaplar\u0131n\u0131z teslim ediliyor
-time_left={0} dakika {1} saniyeniz kald\u0131
 time_up=S\u00fcre bitti.
 hide_show=Kalan S\u00fcreyi Gizle/G\u00f6ster
 session_will_timeout=Oturumunuz 5 dakika i\u00e7inde sona erecektir. Yenilemek i\u00e7in Tamam se\u00e7ene\u011fine t\u0131klay\u0131n.

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java

@@ -305,11 +305,6 @@ public class DeliveryBean implements Serializable {
   @Getter @Setter
   private Map itemContentsMap;
 
-  @Getter @Setter
-  private String minutesLeft;
-  @Getter @Setter
-  private String secondsLeft;
-
   // For paging
   @Getter @Setter
   private int partIndex;
@@ -2604,15 +2599,6 @@ public String getMinReqScale() {
       return ServerConfigurationService.getString("samigo.ajaxTimerMinReqScale","5000");
     }
 
-    public void calculateMinutesAndSecondsLeft() {
-        int milliseconds = getAutoSaveRepeatMilliseconds();
-        if (milliseconds > 0) {
-            Date d = new Date(milliseconds);
-            this.setMinutesLeft(String.valueOf(d.getMinutes()));
-            this.setSecondsLeft(String.valueOf(d.getSeconds()));
-        }
-    }
-
     public String getCDNQuery() {
         return PortalUtils.getCDNQuery();
     }

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/BeginDeliveryActionListener.java

@@ -115,7 +115,6 @@ public void processAction(ActionEvent ae) throws
     	}
     } else {
     	delivery.setFromPrint(false);
-        delivery.calculateMinutesAndSecondsLeft();
     }
 
     int action = delivery.getActionMode();

samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp

@@ -256,8 +256,6 @@ document.links[newindex].onclick();
 <h:inputHidden id="showTimer" value="#{delivery.showTimer}"/>
 <h:inputHidden id="dueDate" value="#{delivery.dueDate.time}" rendered="#{delivery.dueDate != null}" />
 <h:inputHidden id="retractDate" value="#{delivery.retractDate.time}" rendered="#{delivery.retractDate != null}" />
-<h:inputHidden id="minutesLeft" value="#{delivery.minutesLeft}" rendered="#{delivery.minutesLeft != null}" />
-<h:inputHidden id="secondsLeft" value="#{delivery.secondsLeft}" rendered="#{delivery.secondsLeft != null}" />
 
 <!-- DONE BUTTON FOR PREVIEW -->
 <h:panelGroup rendered="#{delivery.actionString=='previewAssessment'}">
@@ -431,7 +429,11 @@ document.links[newindex].onclick();
              <h:outputText value="#{deliveryMessages.time_expired2} " />
            </div>
            <div role="alert" class="sak-banner-error" style="display: none" id="autosave-timeleft-warning">
-             <h:outputFormat value="#{deliveryMessages.time_left}"><f:param value="#{delivery.minutesLeft}"/><f:param value="#{delivery.secondsLeft}"/></h:outputFormat>
+             <h:panelGroup rendered="#{(delivery.deadlineString != null && delivery.deadlineString ne '')}">
+               <h:outputFormat value="#{deliveryMessages.time_left}" escape="false">
+                 <f:param value="#{delivery.deadlineString}"/>
+               </h:outputFormat>
+             </h:panelGroup>
            </div>
            <div role="alert" class="sak-banner-error" style="display: none" id="autosave-failed-warning">
              <p><h:outputText value="#{deliveryMessages.autosaveFailed}" escape="false" /></p>