Merge pull request #462 from khoa-nd/master

Merged

pom.xml

@@ -493,35 +493,16 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.itextpdf</groupId>
-      <artifactId>itextpdf</artifactId>
-      <version>5.5.8</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.itextpdf.tool</groupId>
-      <artifactId>xmlworker</artifactId>
-      <version>5.5.8</version>
-    </dependency>
-
-
-    <!--<dependency>-->
-      <!--<groupId>org.jfree</groupId>-->
-      <!--<artifactId>jfreechart</artifactId>-->
-      <!--<version>1.0.19</version>-->
-    <!--</dependency>-->
-
     <!--<dependency>-->
-      <!--<groupId>net.sourceforge.htmlunit</groupId>-->
-      <!--<artifactId>htmlunit</artifactId>-->
-      <!--<version>2.19</version>-->
+      <!--<groupId>com.itextpdf</groupId>-->
+      <!--<artifactId>itextpdf</artifactId>-->
+      <!--<version>5.5.8</version>-->
     <!--</dependency>-->
 
     <!--<dependency>-->
-      <!--<groupId>commons-io</groupId>-->
-      <!--<artifactId>commons-io</artifactId>-->
-      <!--<version>2.42.4</version>-->
+      <!--<groupId>com.itextpdf.tool</groupId>-->
+      <!--<artifactId>xmlworker</artifactId>-->
+      <!--<version>5.5.8</version>-->
     <!--</dependency>-->
 
     <dependency>

src/main/java/com/techlooper/config/CoreConfiguration.java

@@ -8,6 +8,8 @@
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.calendar.Calendar;
 import com.google.api.services.calendar.CalendarScopes;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.pdf.BaseFont;
 import com.techlooper.converter.ListCSVStringConverter;
 import com.techlooper.converter.LocaleConverter;
 import com.techlooper.converter.ProfileNameConverter;
@@ -47,6 +49,7 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+import org.xhtmlrenderer.pdf.ITextRenderer;
 
 import javax.annotation.Resource;
 import javax.mail.internet.MimeMessage;
@@ -366,10 +369,10 @@ public Template finalChallengeReportVi(freemarker.template.Configuration freemak
     return freemakerConfig.getTemplate("FINAL_CHALLENGE_REPORT_VI.ftl");
   }
 
-//  @Bean
-//  public ITextRenderer reportRender() throws IOException, DocumentException {
-//    ITextRenderer renderer = new ITextRenderer();
-//    renderer.getFontResolver().addFont("font/verdana.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
-//    return renderer;
-//  }
+  @Bean
+  public ITextRenderer reportRender() throws IOException, DocumentException {
+    ITextRenderer renderer = new ITextRenderer();
+    renderer.getFontResolver().addFont("font/verdana.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
+    return renderer;
+  }
 }

src/main/java/com/techlooper/controller/SharingController.java

@@ -1,11 +1,15 @@
 package com.techlooper.controller;
 
 import com.techlooper.dto.ResourceDto;
+import com.techlooper.entity.ChallengeEntity;
+import com.techlooper.repository.elasticsearch.ChallengeRepository;
 import com.techlooper.repository.elasticsearch.ProjectRepository;
 import com.techlooper.repository.elasticsearch.SalaryReviewRepository;
 import com.techlooper.service.ChallengeService;
 import com.techlooper.service.ReportService;
 import com.techlooper.service.WebinarService;
+import com.techlooper.util.DateTimeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,6 +25,9 @@
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 
 /**
  * Created by phuonghqh on 5/11/15.
@@ -49,7 +56,7 @@ public class SharingController {
   private ReportService reportService;
 
   @Resource
-  private ViewResolver viewResolver;
+  private ChallengeRepository challengeRepository;
 
   @RequestMapping(value = "renderSalaryReport/{language}/{salaryReviewId}")
   public String renderReport(@PathVariable String language, @PathVariable Long salaryReviewId, ModelMap model) {
@@ -109,7 +116,12 @@ public void renderFinalChallengeReport(@PathVariable Long challengeId, HttpServl
 
     byte[] data = os.toByteArray();
     response.setContentType("application/pdf");
-    response.setHeader("Content-disposition", "attachment;filename=report.pdf");
+
+    ChallengeEntity challenge = challengeRepository.findOne(challengeId);
+    String reportName = String.format("attachment;filename=%s-%s.pdf",
+      StringUtils.stripAccents(challenge.getChallengeName()).replaceAll("\\W", "-"),
+      DateTimeUtils.currentDate());
+    response.setHeader("Content-disposition", reportName);
     response.setContentLength(data.length);
     response.getOutputStream().write(data);
     response.getOutputStream().flush();

src/main/java/com/techlooper/dto/FinalChallengeReportDto.java

@@ -1,13 +1,10 @@
 package com.techlooper.dto;
 
-import com.techlooper.entity.ChallengeRegistrantDto;
 import com.techlooper.entity.ChallengeRegistrantEntity;
 import com.techlooper.model.ChallengeDto;
-import com.techlooper.model.ChallengePhaseEnum;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -25,8 +22,6 @@ public class FinalChallengeReportDto extends ChallengeDto {
 
   private String phaseOptions = "";
 
-//  private static final ChallengePhaseEnum[] ALL_OPTS = new ChallengePhaseEnum[] {ChallengePhaseEnum.IDEA, ChallengePhaseEnum.UIUX, ChallengePhaseEnum.PROTOTYPE};
-
   public String getBaseUrl() {
     return baseUrl;
   }

src/main/java/com/techlooper/service/impl/ReportServiceImpl.java

@@ -1,6 +1,6 @@
 package com.techlooper.service.impl;
 
-import com.itextpdf.text.pdf.BaseFont;
+import com.lowagie.text.PageSize;
 import com.techlooper.dto.FinalChallengeReportDto;
 import com.techlooper.dto.PhaseEntry;
 import com.techlooper.dto.PhaseEntry.PhaseEntryBuilder;
@@ -60,8 +60,8 @@ public class ReportServiceImpl implements ReportService {
   @Value("${web.baseUrl}")
   private String baseUrl;
 
-//  @Resource
-//  private ITextRenderer reportRender;
+  @Resource
+  private ITextRenderer reportRender;
 
   public ByteArrayOutputStream generateFinalChallengeReport(String challengeAuthorEmail, Long challengeId) {
     ChallengeEntity challenge = challengeRepository.findOne(challengeId);
@@ -111,12 +111,15 @@ public ByteArrayOutputStream generateFinalChallengeReport(String challengeAuthor
 
       ByteArrayOutputStream os = new ByteArrayOutputStream();
 
-      ITextRenderer reportRender = new ITextRenderer();
-      reportRender.getFontResolver().addFont("font/verdana.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
+//      ITextRenderer reportRender = new ITextRenderer();
+//      reportRender.getFontResolver().addFont("font/verdana.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED);
       reportRender.setDocumentFromString(stringWriter.toString());
       reportRender.layout();
       reportRender.createPDF(os);
-      reportRender.finishPDF();
+//      reportRender.getWriter().setMarginMirroring(true);
+//      reportRender.getWriter().setMargins(0, 0, 0, 0);
+//      reportRender.getWriter().setPageSize(PageSize.A4);
+//      reportRender.finishPDF();
       stringWriter.flush();
       return os;
     }

src/main/resources/template/CHALLENGE_DAILY_SUMMARY_EN.ftl

@@ -536,17 +536,6 @@
                                                                         <img height="15px" width="1" src="http://images.vietnamworks.com/x.gif" style="display:block; border: 0px" />
                                                                     </td>
                                                                 </tr>
-                                                                <tr>
-                                                                    <td style="text-align: center; padding: 10px 0">
-                                                                        <table border="0" cellspacing="0" cellpadding="0" align="center" style="margin: 0 auto; width: auto" class="fullWidth">
-                                                                            <tbody><tr>
-                                                                                <td bgcolor="#277cbd" width="100%" style="padding: 7px 20px; font-weight: 700; -webkit-border-radius:3px; border-radius:3px; text-align: center">
-                                                                                    <a href="" target="_blank" style="font-family: Arial, sans-serif; font-size: 14px; color: #ffffff; text-decoration: none; display: block; width: 100%">Accept Submissions</a>
-                                                                                </td>
-                                                                            </tr>
-                                                                            </tbody></table>
-                                                                    </td>
-                                                                </tr>
                                                             </table>
                                                         </td>
                                                     </tr>

src/main/resources/template/CHALLENGE_NOTIFY_EMPLOYER_UPDATE_CRITERIA_EN.ftl

@@ -186,7 +186,7 @@
                         <table width="300px" border="0" cellspacing="0" cellpadding="0" align="center" style="margin: 0 auto;" class="fullWidth">
                           <tr>
                             <td bgcolor="#277cbd" width="100%" style="padding: 10px 5px; -webkit-border-radius:3px; border-radius:3px; text-align: center">
-                              <a href="${webBaseUrl}#/challenge-detail/${challengeNameAlias}-${challengeId}-id?toPhase=evaluationCriteria&utm_source=updatecriteria&utm_medium=updatebtn&utm_campaign=onlinecontest" target="_blank" style="font-family: Arial, sans-serif; font-size: 16px; color: #ffffff; text-decoration: none; display: block; width: 100%">Update judging & scoring criteria</a>
+                              <a href="${webBaseUrl}#/challenge-detail/${challengeNameAlias}-${challengeId}-id?a=evaluationCriteria&utm_source=updatecriteria&utm_medium=updatebtn&utm_campaign=onlinecontest" target="_blank" style="font-family: Arial, sans-serif; font-size: 16px; color: #ffffff; text-decoration: none; display: block; width: 100%">Update judging & scoring criteria</a>
                             </td>
                           </tr>
                         </table>

src/main/resources/template/CHALLENGE_NOTIFY_EMPLOYER_UPDATE_CRITERIA_VI.ftl

@@ -186,7 +186,7 @@
                                                 <table width="300px" border="0" cellspacing="0" cellpadding="0" align="center" style="margin: 0 auto;" class="fullWidth">
                                                     <tr>
                                                         <td bgcolor="#277cbd" width="100%" style="padding: 10px 5px; -webkit-border-radius:3px; border-radius:3px; text-align: center">
-                                                            <a href="${webBaseUrl}#/challenge-detail/${challengeNameAlias}-${challengeId}-id?toPhase=evaluationCriteria&utm_source=updatecriteria&utm_medium=updatebtn&utm_campaign=onlinecontest" target="_blank" style="font-family: Arial, sans-serif; font-size: 16px; color: #ffffff; text-decoration: none; display: block; width: 100%">Thiết lập ngay</a>
+                                                            <a href="${webBaseUrl}#/challenge-detail/${challengeNameAlias}-${challengeId}-id?a=evaluationCriteria&utm_source=updatecriteria&utm_medium=updatebtn&utm_campaign=onlinecontest" target="_blank" style="font-family: Arial, sans-serif; font-size: 16px; color: #ffffff; text-decoration: none; display: block; width: 100%">Thiết lập ngay</a>
                                                         </td>
                                                     </tr>
                                                 </table>

src/main/resources/template/FINAL_CHALLENGE_REPORT_EN.ftl

@@ -18,7 +18,7 @@
       <table width="100%" cellpadding="0" cellspacing="0">
         <tr>
           <th align="left">
-            <h2 style="font-size: 18px; font-weight: normal; text-transform: capitalize;color: #898989;">
+            <h2 style="font-size: 18px; font-weight: normal; text-transform: capitalize;color: #000;">
           ${challengeName}
             <span style="font-size: 25px; font-weight: normal; color:#1c7abc">$${totalPlaceReward?string["0.####"]}</span>
             </h2>
@@ -37,9 +37,11 @@
             </table>
           </td>
         </tr>
+        <tr>
+          <td align="left" style="height: 50px;"></td>
+        </tr>
         <tr>
           <td align="center">
-            <br/>
             <#if winnersInfo?size != 0>
               <span style="font-size: 12px; font-weight: normal"><strong style="font-size: 25px; color:#bf3a2f">${winnersInfo?size}</strong> winner(s)</span>
               <#list winnersInfo as winnerInfo>
@@ -65,7 +67,7 @@
           <td align="left" style="height: 1px; background-color: #8d8d8d;"></td>
         </tr>
         <tr>
-          <td align="left" style="height: 30px;"></td>
+          <td align="left" style="height: 5px;"></td>
         </tr>
         <tr>
           <td align="left" width="100%">

src/main/webapp/assets/modules/common/onFinishRender.js

@@ -3,7 +3,10 @@ techlooper.directive("onFinishRender", function ($timeout, jsonValue, utils) {
     restrict: "A",
     link: function (scope, element, attr) {
       if (scope.$last === true) {
-        scope.$emit(attr.onFinishRender);
+        $timeout(function () {
+          scope.$emit(attr.onFinishRender);
+        });
+        utils.sendNotification(jsonValue.notifications.loaded, $(window).height());
       }
     }
   }