Merge pull request #12 from FroMage/bugfix/fix_hearts_not_loading

Bugfix/fix hearts not loading

src/main/java/model/Configuration.java

@@ -139,6 +139,14 @@ public static boolean ticketingTrainingIsOpen() {
         return config != null && config.value.equals("true");
     }
 
+    /**
+     * Retourne l'Url de la page de Openfeedback du talk.
+     */
+    public static String getFeedbackUrl(Long id) {
+        Configuration config = Configuration.find("key", ConfigurationKey.FEEDBACK_URL).firstResult();
+        return config != null ? config.value + "/" + id : null;
+    }
+
     /**
      * Return true if Call For Paper is opened, false otherwise
      */

src/main/java/model/ConfigurationKey.java

@@ -44,6 +44,8 @@ public enum ConfigurationKey {
     TICKETING_TRAINING_URL,
     /* [true, false] Si true, permet d'accéder à la page de l'organisme de formation */
     TICKETING_TRAINING_OPEN,
+    /* Feedback Url */
+    FEEDBACK_URL, 
     /* URL de la plaquette de sponsoring */
     SPONSORING_LEAFLET_URL,
     /* [true, false] true if the Call For Paper is opened, false otherwise */

src/main/java/rest/Application.java

@@ -92,7 +92,7 @@ public static native TemplateInstance speakers(List<Speaker> speakers, List<Spea
 		public static native TemplateInstance sponsor(Sponsor sponsor);
 		public static native TemplateInstance sponsorBanner(Sponsor sponsor);
 
-		public static native TemplateInstance talk(Talk talk, boolean displayFullSchedule);
+		public static native TemplateInstance talk(Talk talk, boolean displayFullSchedule, String feedbackUrl);
 
 		public static native TemplateInstance organisers(List<Organiser> orgas);
 
@@ -346,10 +346,11 @@ public TemplateInstance sponsor(@RestPath Long id) {
 
     @Path("/session")
     public TemplateInstance talk(@RestPath Long id) {
+        String feedbackUrl = Configuration.getFeedbackUrl(id);
         Talk talk = Talk.findById(id);
         notFoundIfNull(talk);
         boolean displayFullSchedule = Configuration.displayFullSchedule();
-        return Templates.talk(talk, displayFullSchedule);
+        return Templates.talk(talk, displayFullSchedule, feedbackUrl);
     }
 
     @Path("/sponsors")

src/main/resources/db/migration/V3.0.0__add-config.sql

@@ -0,0 +1,2 @@
+alter table Configuration drop constraint if exists Configuration_key_check;
+alter table Configuration add constraint Configuration_key_check check (key in ('GOOGLE_MAP_API_KEY','EVENT_START_DATE','EVENT_END_DATE','DISPLAY_FULL_SCHEDULE','DISPLAY_NEW_SPEAKERS','DISPLAY_TALKS','PROMOTED_PAGE','PROMOTED_PAGE_2','TICKETING_URL','TICKETING_OPEN','TICKETING_TRAINING_URL','TICKETING_TRAINING_OPEN','SPONSORING_LEAFLET_URL','CFP_OPEN','CFP_URL','CANCELLED_URL', 'FEEDBACK_URL'));

src/main/resources/messages.properties

@@ -118,6 +118,7 @@ views.application.speakers.title=Speakers
 views.application.speakers.subtitle=Discover all our amazing speakers !
 views.application.speakers.unavailable=The speaker list is not available yet.
 views.application.speakers.subscribe=Subscribe to the newsletter to be notified when the speaker list is published.
+views.application.speakers.feedback-button=Give your feedback!
 
 views.application.speaker.title=Speaker
 views.application.speaker.linkTitle= Tweet about it !

src/main/resources/messages_fr.properties

@@ -118,7 +118,10 @@ views.application.coc.chapter.3.content.4=Pour toute question, merci de contacte
 views.application.speakers.title=Orateurs
 views.application.speakers.subtitle=Découvrez tous nos super orateurs !
 views.application.index.speakers.link=Découvrez tous les orateurs
+
 views.application.speakers.unavailable=La liste des orateurs n'est pas encore disponible.
+views.application.speakers.feedback-button=Donner votre avis !
+
 views.application.speakers.subscribe=Abonnez-vous à la newsletter pour être prévenu dès que les orateurs sont connus.
 
 views.application.speaker.title=Orateur

src/main/resources/templates/Application/talk.html

@@ -6,6 +6,6 @@ <h1 class="page__mainTitle">{m:views.application.talk.title}</h1>
 </div>
 
 <div class="page__container notFullWidth">
-    {#talk talk=talk/}
+    {#talk talk=talk feedbackUrl=feedbackUrl /}
 </div>
 {/include}

src/main/resources/templates/main.html

@@ -556,7 +556,7 @@ <h2 class="footer__title footer__contactTitle">
             window.onload = function() {
                 // Animate loader off screen
                 $('.loading').fadeOut('slow');
-                window.onload = initLikedTalks;
+                initLikedTalks();
                 window.initBurgerMenu();
             };
 

src/main/resources/templates/tags/talk.html

@@ -58,4 +58,16 @@
             </div>
         {/if}
     </div>
+    {#if feedbackUrl}
+        <div class="talkDetails__footer">
+            <div class="talkDetails__feedback">
+                <a class="button button--white"
+            href="{feedbackUrl}"
+            target="_blank"
+        >
+                {m:views.application.speakers.feedback-button}
+            </a>
+            </div>
+        </div>
+    {/if}
 </div>

src/main/resources/web/app/stylesheets/partials/_talk.scss

@@ -146,6 +146,7 @@
         width: 70%;
     }
 
+    &__footer,
     &__header {
         border-radius: $borderRadius $borderRadius 0 0;
         color: $color-white;