Почетна Преглед Помоћ
Пријавите се
TripleA
/
demovote-backend
3
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

dev en cours

rajah пре 7 месеци
родитељ
5cc35970a6
комит
5d1c389170
5 измењених фајлова са 118 додато и 79 уклоњено
Подељен поглед Покажи статистику Diff
  1. 2 0
      src/main/java/fr/triplea/demovote/model/Production.java
  2. 76 71
      src/main/java/fr/triplea/demovote/web/controller/PresentationController.java
  3. 8 4
      src/main/resources/langs/messages_en.properties
  4. 8 4
      src/main/resources/langs/messages_fr.properties
  5. 24 0
      src/main/resources/styles/diapos.css

+ 2 - 0
src/main/java/fr/triplea/demovote/model/Production.java
Прегледај датотеку 

@@ -198,6 +198,8 @@ public class Production
 
   
   public void setPlateforme(String str) { if (str != null) { this.plateforme = StringUtils.truncate(str, 128); } }
 
   public String getPlateforme() { return this.plateforme; }
 
+  @Transient
 
+  public boolean hasPlateforme() { if (this.plateforme == null) { return false; } return (this.plateforme.length() > 0); }
 
   
   public void setCommentaire(String str) { this.commentaire = new String(str); }
 
   public String getCommentaire() { return this.commentaire; }

+ 76 - 71
src/main/java/fr/triplea/demovote/web/controller/PresentationController.java
Прегледај датотеку 

@@ -3,6 +3,8 @@ package fr.triplea.demovote.web.controller;
 
 
 import java.awt.Color;
 
 import java.io.ByteArrayOutputStream;
 
+import java.io.IOException;
 
+import java.nio.charset.Charset;
 
 import java.util.ArrayList;
 
 import java.util.List;
 
 import java.util.Locale;
 
@@ -13,6 +15,7 @@ import org.apache.pdfbox.pdmodel.common.PDRectangle;
 
 import org.slf4j.Logger;
 
 import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.beans.factory.annotation.Value;
 
 import org.springframework.context.MessageSource;
 
 import org.springframework.core.io.ByteArrayResource;
 
 import org.springframework.core.io.Resource;
 
@@ -20,6 +23,7 @@ import org.springframework.http.HttpHeaders;
 
 import org.springframework.http.MediaType;
 
 import org.springframework.http.ResponseEntity;
 
 import org.springframework.security.access.prepost.PreAuthorize;
 
+import org.springframework.util.StreamUtils;
 
 import org.springframework.web.bind.annotation.GetMapping;
 
 import org.springframework.web.bind.annotation.PathVariable;
 
 import org.springframework.web.bind.annotation.PutMapping;
 
@@ -231,6 +235,8 @@ public class PresentationController
 
   }
 
 
   
+  @Value("classpath:styles/diapos.css")
 
+  private Resource styleDiaposResource;
 
   
   @GetMapping(value = "/diapos/{id}")
 
   @PreAuthorize("hasRole('ADMIN')")
 
@@ -248,40 +254,25 @@ public class PresentationController
 
          
       StringBuffer sb = new StringBuffer();
 
 
-      sb.append("<html>\n");
 
-      sb.append("<header>\n");
 
-      
-      // TODO version diaporama en HTML pour affichage sur écran de régie
 
-
 
-      /*
 
-       .diapo_compo_start {  }
 
-       .diapo_compo_page {  }
 
-       .diapo_compo_finish {  }
 
-       .diapo_bouton {  }
 
-       .diapo_compo {  }
 
-       .diapo_order {  }
 
-       .diapo_title {  }
 
-       .diapo_authors {  }
 
-       .diapo_comments {  }
 
-       .diapo_warning {  }
 
-       .diapo_alert {  }
 
-       .diapo_image_container {  }
 
-       .diapo_image_content {  }
 
-       .diapo_image {  }
 
-       .diapo_audio_container {  }
 
-       .diapo_video_container {  }
 
-      */
 
-      
-      sb.append("</header>\n");
 
+      sb.append("<!doctype html>\n");
 
+      sb.append("<html lang=\"").append(locale.stripExtensions().toString()).append("\">\n");
 
+      sb.append("<head>\n");
 
+      sb.append("<title>").append(libelleCategorie).append("</title>\n");
 
+      sb.append("<style>\n");
 
+      try { sb.append(StreamUtils.copyToString(styleDiaposResource.getInputStream(), Charset.defaultCharset())); } catch (IOException e) { LOG.error(e.toString()); }
 
+      sb.append("</style>\n");
 
+      sb.append("</head>\n\n");
 
       sb.append("<body>\n");
 
 
-      sb.append("<div class=\"diapo_compo_start\" id=\"diapo_page_0\">\n");
 
+      sb.append("<div class=\"diapo_start\" id=\"diapo_page_0\">\n");
 
       
-        sb.append("<div class=\"diapo_compo\">").append(libelleCategorie).append("</div>\n");
 
+      sb.append("\t").append("<div class=\"diapo_compo\">").append(libelleCategorie).append("</div>\n");
 
+      sb.append("\t").append("<div class=\"diapo_range\">").append(messageSource.getMessage("show.file.starting", null, locale)).append("</div>\n");
 
 
-        sb.append("<div class=\"diapo_hub\">\n");
 
-        sb.append("<button class=\"diapo_bouton\" title=\"").append(messageSource.getMessage("show.file.next", null, locale)).append("\">&#9658;</button>\n");
 
-        sb.append("</div>\n");
 
+      sb.append("\t").append("<div class=\"diapo_hub\">\n");
 
+      sb.append("\t").append("\t").append("<button class=\"diapo_bouton\" style=\"visibility:hidden;\">&#9665;</button>\n");
 
+      sb.append("\t").append("\t").append("<button class=\"diapo_bouton\" onClick=\"show_next(0);\" title=\"").append(messageSource.getMessage("show.file.next", null, locale)).append("\">&#9655;</button>\n");
 
+      sb.append("\t").append("</div>\n");
 
       
       sb.append("</div>\n");
 
 
@@ -292,70 +283,84 @@ public class PresentationController
 
         Presentation d = presentations.get(i);
 
         Production p = d.getProduction();
 
 
-        sb.append("<div class=\"diapo_compo_page\" id=\"diapo_page_" + n + "\">\n");
 
+        sb.append("<div class=\"diapo_page\" id=\"diapo_page_" + n + "\">\n");
 
 
-          sb.append("<div class=\"diapo_compo\">").append(libelleCategorie).append("</div>\n");
 
-          sb.append("<div class=\"diapo_order\">").append("#").append((i < 26) ? LETTRES.charAt(i) : "?").append("</div>\n");
 
-          sb.append("<div class=\"diapo_title\">").append(p.getTitre()).append("</div>\n");
 
-          sb.append("<div class=\"diapo_authors\">").append(p.getAuteurs()).append(" / ").append(p.getGroupes()).append("</div>\n");
 
-          sb.append("<div class=\"diapo_comments\">").append(p.getCommentaire()).append("</div>\n");
 
+        sb.append("\t").append("<div class=\"diapo_compo\">").append(libelleCategorie).append("</div>\n");
 
+        sb.append("\t").append("<div class=\"diapo_order\">").append("#").append((i < 26) ? LETTRES.charAt(i) : "?").append("</div>\n");
 
+        sb.append("\t").append("<div class=\"diapo_title\">").append(p.getTitre()).append("</div>\n");
 
+        sb.append("\t").append("<div class=\"diapo_authors\">").append(messageSource.getMessage("show.file.by", null, locale)).append(" ").append(p.getAuteurs()).append(" / ").append(p.getGroupes()).append("</div>\n");
 
+        sb.append("\t").append("<div class=\"diapo_comments\">");
 
+        if (p.hasPlateforme()) { sb.append(messageSource.getMessage("show.file.on", null, locale)).append(" ").append(p.getPlateforme()).append("<br/>"); }
 
+        sb.append(p.getCommentaire()).append("</div>\n");
 
 
-        switch (d.getEtatMedia())
 
+        if (d.getEtatMedia() == 1)
 
         {
 
-        case 1:
 
-          
           if (d.getMimeMedia().startsWith("image/"))
 
           {
 
-            sb.append("<div id=\"\" class=\"diapo_image_container\"><div class=\" class=\"diapo_image_content\">");
 
-            sb.append("<img src=\"").append(d.getDataMediaAsString()).append("\" alt=\"\" class=\"diapo_image\" />");
 
-            sb.append("</div></div>\n");
 
+            sb.append("\t").append("<div id=\"diapo_pict_").append(n).append("\" class=\"diapo_image_container\">\n");
 
+            sb.append("\t").append("\t").append("<div class=\"diapo_image_content\" onClick=\"pict_hide(").append(n).append(");\"><img src=\"").append(d.getDataMediaAsString()).append("\" alt=\"\" class=\"diapo_image\" /></div>\n");
 
+            sb.append("\t").append("</div>\n");
 
           }
 
           else if (d.getMimeMedia().startsWith("audio/"))
 
           {
 
-            sb.append("<div id=\"\" class=\"diapo_audio_container\">");
 
-            sb.append("<audio controls><source src=\"").append(d.getDataMediaAsString()).append("\" type=\"").append(d.getMimeMedia()).append("\" />").append("</audio>");
 
-            sb.append("</div>\n");
 
+            sb.append("\t").append("<div id=\"diapo_file_").append(n).append("\" class=\"diapo_audio_container\">\n");
 
+            sb.append("\t").append("\t").append("<audio controls><source src=\"").append(d.getDataMediaAsString()).append("\" type=\"").append(d.getMimeMedia()).append("\" />").append("</audio>\n");
 
+            sb.append("\t").append("</div>\n");
 
           }
 
           else if (d.getMimeMedia().startsWith("video/"))
 
           {
 
-            sb.append("<div id=\"\" class=\"diapo_video_container\">");
 
-            sb.append("<video controls width=\"480\" height=\"240\"><source src=\"").append(d.getDataMediaAsString()).append("\" type=\"").append(d.getMimeMedia()).append("\" />");
 
-            sb.append("</video>");
 
-            sb.append("</div>\n");
 
+            sb.append("\t").append("<div id=\"diapo_file_").append(n).append("\" class=\"diapo_video_container\">\n");
 
+            sb.append("\t").append("\t").append("<video controls width=\"480\" height=\"240\"><source src=\"").append(d.getDataMediaAsString()).append("\" type=\"").append(d.getMimeMedia()).append("\" />").append("</video>\n");
 
+            sb.append("\t").append("</div>\n");
 
           }
 
-          
-          break;
 
-        case 2:
 
-
 
-          sb.append("<div class=\"diapo_warning\">").append(messageSource.getMessage("show.file.acknowlegded", null, locale)).append("</div>\n");
 
-
 
-          break;
 
-        default:
 
-
 
-          sb.append("<div class=\"diapo_alert\">").append(messageSource.getMessage("show.file.missing", null, locale)).append("</div>\n");
 
-          
-          break;
 
         }
 
 
-          sb.append("<div class=\"diapo_hub\">\n");
 
-          sb.append("<button class=\"diapo_bouton\" title=\"").append(messageSource.getMessage("show.file.previous", null, locale)).append("\">&#9668;</button>\n");
 
-          sb.append("<button class=\"diapo_bouton\" title=\"").append(messageSource.getMessage("show.file.next", null, locale)).append("\">&#9658;</button>\n");
 
-          sb.append("</div>\n");
 
+        sb.append("\t").append("<div id=\"diapo_ctrl_").append(n).append("\" class=\"diapo_hub\">\n");
 
+        sb.append("\t").append("\t").append("<button class=\"diapo_bouton\" onClick=\"show_prev(").append(n).append(");\" title=\"").append(messageSource.getMessage("show.file.previous", null, locale)).append("\">&#9665;</button>\n");
 
+        sb.append("\t").append("\t").append("<button class=\"diapo_bouton\" onClick=\"show_next(").append(n).append(");\" title=\"").append(messageSource.getMessage("show.file.next", null, locale)).append("\">&#9655;</button>\n");
 
+        if ((d.getEtatMedia() == 1))
 
+        {
 
+          if (d.getMimeMedia().startsWith("image/"))
 
+          {
 
+            sb.append("\t").append("\t").append("<button class=\"diapo_bouton\" onClick=\"pict_open(").append(n).append(");\" title=\"").append(messageSource.getMessage("show.file.open", null, locale)).append("\">&#9713;</button>\n");
 
+          }
 
+          else
 
+          {
 
+            sb.append("\t").append("\t").append("<button class=\"diapo_bouton\" onClick=\"file_open(").append(n).append(");\" title=\"").append(messageSource.getMessage("show.file.open", null, locale)).append("\">&#9713;</button>\n");
 
+          }
 
+        }
 
+        else if ((d.getEtatMedia() == 2))
 
+        {
 
+          sb.append("\t").append("\t").append("<button class=\"diapo_warning\">").append(messageSource.getMessage("show.file.acknowlegded", null, locale)).append("</button>\n");
 
+        }
 
+        else
 
+        {
 
+          sb.append("\t").append("\t").append("<button class=\"diapo_alert\">").append(messageSource.getMessage("show.file.missing", null, locale)).append("</button>\n");
 
+        }
 
+        sb.append("\t").append("</div>\n");
 
 
-        sb.append("</div>");
 
+        sb.append("</div>\n");
 
         n++;
 
       }
 
       
-      sb.append("<div class=\"diapo_compo_finish\" id=\"diapo_page_" + n + "\">\n");
 
+      sb.append("<div class=\"diapo_page\" id=\"diapo_page_" + n + "\">\n");
 
       
-        sb.append("<div class=\"diapo_compo\">").append(libelleCategorie).append("</div>\n");
 
+      sb.append("\t").append("<div class=\"diapo_compo\">").append(libelleCategorie).append("</div>\n");
 
+      sb.append("\t").append("<div class=\"diapo_range\">").append(messageSource.getMessage("show.file.ending", null, locale)).append("</div>\n");
 
 
-        sb.append("<div class=\"diapo_hub\">\n");
 
-        sb.append("<button class=\"diapo_bouton\" title=\"").append(messageSource.getMessage("show.file.previous", null, locale)).append("\">&#9668;</button>\n");
 
-        sb.append("</div>\n");
 
+      sb.append("\t").append("<div class=\"diapo_hub\">\n");
 
+      sb.append("\t").append("\t").append("<button class=\"diapo_bouton\" onClick=\"show_prev(").append(n).append(");\" title=\"").append(messageSource.getMessage("show.file.previous", null, locale)).append("\">&#9665;</button>\n");
 
+      sb.append("\t").append("</div>\n");
 
       
       sb.append("</div>\n");
 
 
+      sb.append("<script type=\"text/javascript\">\n");
 
+      sb.append("function show_prev(num) { var cur = document.getElementById(\"diapo_page_\" + num); var prv = document.getElementById(\"diapo_page_\" + (num - 1)); if (cur) { cur.style.visibility = 'hidden'; cur.style.display = 'none'; } if (prv) { prv.style.visibility = 'visible'; prv.style.display = 'block'; } }\n");
 
+      sb.append("function show_next(num) { var cur = document.getElementById(\"diapo_page_\" + num); var nxt = document.getElementById(\"diapo_page_\" + (num + 1)); if (cur) { cur.style.visibility = 'hidden'; cur.style.display = 'none'; } if (nxt) { nxt.style.visibility = 'visible'; nxt.style.display = 'block'; } }\n");
 
+      sb.append("function pict_open(num) { var hub = document.getElementById(\"diapo_ctrl_\" + num); var pic = document.getElementById(\"diapo_pict_\" + num); if (hub) { hub.style.visibility = 'hidden'; hub.style.display = 'none'; } if (pic) { pic.style.visibility = 'visible'; pic.style.display = 'block'; } }\n");
 
+      sb.append("function pict_hide(num) { var hub = document.getElementById(\"diapo_ctrl_\" + num); var pic = document.getElementById(\"diapo_pict_\" + num); if (hub) { hub.style.visibility = 'visible'; hub.style.display = 'block'; } if (pic) { pic.style.visibility = 'hidden'; pic.style.display = 'none'; } }\n");
 
+      sb.append("function file_open(num) { var fil = document.getElementById(\"diapo_file_\" + num); if (fil) { if (fil.style.visibility == 'visible') { fil.style.visibility = 'hidden'; fil.style.display = 'none'; } else { fil.style.visibility = 'visible'; fil.style.display = 'block'; } } }\n");
 
+      sb.append("</script>\n");
 
       sb.append("</body>\n");
 
       sb.append("</html>\n");

+ 8 - 4
src/main/resources/langs/messages_en.properties
Прегледај датотеку 

@@ -42,10 +42,14 @@ show.pdf.comments=Comments
 
 show.pdf.private=Private informations
 
 show.pdf.productions=prod(s)
 
 
-show.file.loaded=The media for this production is uploaded.
 
-show.file.acknowlegded=The media for this production is known and managed externaly.
 
-show.file.cleaned=The media for this production is deleted.
 
-show.file.missing=The media for this production is missing.
 
+show.file.loaded=The displayable media for this production is uploaded.
 
+show.file.acknowlegded=The displayable media for this production is known and managed externaly.
 
+show.file.cleaned=The displayable media for this production is deleted.
 
+show.file.missing=The displayable media for this production is missing.
 
 show.file.previous=Go to previous page
 
 show.file.next=Go to next page
 
 show.file.open=Open
 
+show.file.by=by
 
+show.file.on=plateform:
 
+show.file.starting=Starting...
 
+show.file.ending=Closed.

+ 8 - 4
src/main/resources/langs/messages_fr.properties
Прегледај датотеку 

@@ -42,10 +42,14 @@ show.pdf.comments=Commentaires
 
 show.pdf.private=Informations privées
 
 show.pdf.productions=production(s)
 
 
-show.file.loaded=Le média de présentation pour cette production a été chargé.
 
-show.file.acknowlegded=Le média de présentation pour cette production est géré en externe.
 
-show.file.cleaned=Le média de présentation pour cette production est effacé.
 
-show.file.missing=Le média est manquant pour la production.
 
+show.file.loaded=Le média présentable de cette production a été chargé.
 
+show.file.acknowlegded=Le média présentable de cette production est géré en externe.
 
+show.file.cleaned=Le média présentable de cette production est effacé.
 
+show.file.missing=Le média présentable de cette production est manquant.
 
 show.file.previous=Aller à la page précédente
 
 show.file.next=Aller à la page suivante
 
 show.file.open=Ouvrir
 
+show.file.by=par
 
+show.file.on=plateforme :
 
+show.file.starting=Début des présentations
 
+show.file.ending=Fin des présentations

+ 24 - 0
src/main/resources/styles/diapos.css
Прегледај датотеку 

@@ -0,0 +1,24 @@
 
+body { overflow: hidden; padding:0; margin:0; font-family: sans-serif; background-color:lightgray; vertical-align:middle; }
 
+
 
+.diapo_start { position:absolute; visibility:visible; display:block; width:100vw; height:100vh; }
 
+.diapo_page { position:absolute; visibility:hidden; display:none; width:100vw; height:100vh; }
 
+
 
+.diapo_range { position:absolute; right:10%; top:60%; width:88%; height:27%; overflow:auto; background-color: transparent; font-size:4vh; padding:10px; text-align:right; }
 
+
 
+.diapo_compo { position:absolute; left:0; top:5%; width:100%; background-color:white; font-size:7vh; padding:10px; height:6vh; }
 
+.diapo_order { position:absolute; left:0; top:20%; background-color: transparent; font-size:6vh; padding:10px; }
 
+.diapo_title { position:absolute; left:10%; top:30%; width:88%; height:10%; overflow:auto;  background-color: transparent; font-size:6vh; padding:10px; }
 
+.diapo_authors { position:absolute; left:10%; top:45%; width:88%; height:10%; overflow:auto;  background-color: transparent; font-size:5vh; padding:10px; }
 
+.diapo_comments { position:absolute; left:10%; top:60%; width:88%; height:27%; overflow:auto; background-color: transparent; font-size:3vh; padding:10px; }
 
+
 
+.diapo_hub { position:absolute; bottom:7px; left:7px; white-space: nowrap; }
 
+.diapo_bouton { position:relative; height:30px; border:1px solid black; border-radius:5px; background-color:transparent; display:inline; padding:4px 8px; font-size:16px; }
 
+.diapo_warning { position:relative; height:30px; border:1px solid black; border-radius:5px; display:inline; padding:4px 8px; font-size:16px; white-space: nowrap; }
 
+.diapo_alert { position:relative; height:30px; border:1px solid black; border-radius:5px; background-color:red; color:white; display:inline; padding:4px 8px; font-size:16px; white-space: nowrap; }
 
+
 
+.diapo_image_container { position:absolute; left:0; top:0; visibility:hidden; display:none; }
 
+.diapo_image_content { position:relative; left:0; top:0; background-color:black; width:100vw; height:100vh; }
 
+.diapo_image { position:absolute; left:0; top:0; width:100%; max-height:100vh; display:block; }
 
+
 
+.diapo_audio_container { position:absolute; bottom:10px; right:10px; visibility:hidden; display:none; }
 
+.diapo_video_container { position:absolute; bottom:10px; right:10px; visibility:hidden; display:none; }