Merge pull request #36 from SakalAndrej/develop

Major Update

HomeDsBackend/src/main/java/at/htl/utils/RequestHelper.java

@@ -24,7 +24,7 @@ public HttpURLConnection executeRequest(RequestTypeEnum executeType, String para
             obj = new URL(url);
             con = (HttpURLConnection) obj.openConnection();
             con.setRequestProperty("Authorization", "Bearer " + TOKEN);
-            con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
             switch (executeType) {
                 case GET:
                     con.setRequestMethod("GET");

HomeDsBackend/src/main/java/at/htl/utils/TimeService.java

@@ -85,18 +85,9 @@ public void doWork() {
         }
     }
 
-    @Schedule(hour = "20", minute = "10")
-    public void doSomething() {
-        System.out.println("hour triggered");
-    }
-
-    public TimeService() {
-        System.out.println("Hello one minute");
-    }
-
     @PostConstruct
     public void init() {
-        System.out.println("something");
+        AuthentificationHandler.Authenticate();
     }
 
 

HomeDsBackend/src/main/java/at/htl/web/CrawlController.java

@@ -28,13 +28,12 @@ public class CrawlController implements Serializable {
 
     private String collapsed;
 
-    private CrawlController() {
-    }
+    private CrawlController() { }
 
     @PostConstruct
     public void init() {
-        this.startCrawl();
         actLayoutId = -1;
+        this.startCrawl();
     }
 
     public void startCrawl() {
@@ -54,22 +53,20 @@ public void startCrawl() {
         formatterUrl = "\'http://localhost:8080/homeds/rs/crawler" + query + "\'";
         crawl = crawler.getLayoutsWithAllSubEntities(actLayoutId, name);
 
-        if (!crawl.isEmpty() && crawl.length()>2) {
+        if (!crawl.isEmpty() && crawl.length() > 2) {
             crawl = new JSONArray(crawl).toString();
             collapsed = "false";
-        }
-        else
+        } else
             collapsed = "true";
     }
 
     public void startedCrawlGrowl() {
         FacesContext context = FacesContext.getCurrentInstance();
         startCrawl();
 
-        if (!crawl.isEmpty() && crawl.length()>2) {
+        if (!crawl.isEmpty() && crawl.length() > 2) {
             context.addMessage(null, new FacesMessage("Successful"));
-        }
-        else {
+        } else {
             context.addMessage(null, new FacesMessage("No Content"));
         }
     }

HomeDsBackend/src/main/java/at/htl/web/DataSetController.java

@@ -25,7 +25,7 @@ public class DataSetController implements Serializable {
     @Inject
     DataSetApi dataSetApi;
 
-    private List<DataSetDataField> dataSetData;
+    private static List<DataSetDataField> dataSetData;
 
     private DataSetDataField dataSetToAdd;
 
@@ -105,8 +105,35 @@ public void editDataSet(DataSetDataField dataSetFieldToEdit) {
         FacesContext context = FacesContext.getCurrentInstance();
         if (dataSetFieldToEdit != null && dataSetFieldToEdit.getValue().isEmpty() == false && dataSetFieldToEdit.getTitle().isEmpty() == false) {
 
-            if (dataSetFieldToEdit.getFromDate() != null) {
+            // when the fromdate is null then...
+            if  (dataSetFieldToEdit.getFromDate()==null) {
 
+                // when its active just edit no database delete
+                if (dataSetFieldToEdit.getDataRowId()>1) {
+                    try {
+                        if (dataSetApi.editDataSetField(dataSetFieldToEdit.getDataSetId(), dataSetFieldToEdit.getDataRowId(), 8, dataSetFieldToEdit.getTitle()) == 200 && this.dataSetApi.editDataSetField(dataSetFieldToEdit.getDataSetId(), dataSetFieldToEdit.getDataRowId(), 9, dataSetFieldToEdit.getValue()) == 200) {
+                            dataSetFieldFacade.merge(dataSetFieldToEdit);
+                            this.updateList();
+
+                            dataSetApi.collectNowAll();
+                            context.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "", String.format("Succesfully edited DataSetRow: " + dataSetFieldToEdit.getDataRowId())));
+                        } else {
+                            this.updateList();
+                            context.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "", "Error while editing DataSetRow: " + dataSetFieldToEdit.getDataRowId()));
+                        }
+                    } catch (NoConnectionException e) {
+                        context.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, "", "Error while establishing a connection"));
+                    }
+                }
+                else {
+                    // when its not active make it active
+                    DataSetDataField temp = dataSetFieldToEdit;
+                    dataSetFieldFacade.deleteById(dataSetFieldToEdit.getId());
+                    temp.setId(0);
+                    this.addDataSetToXibo(temp);
+                }
+            }
+            else {
                 // editing from date so that it should be active
                 if (dataSetFieldToEdit.getFromDate().isBefore(LocalDate.now().plusDays(1)) && dataSetFieldToEdit.isActive() == false) {
 
@@ -127,8 +154,6 @@ else if ((dataSetFieldToEdit.getDataRowId() < 0 || dataSetFieldToEdit.isActive()
                 else if (dataSetFieldToEdit.isActive() && dataSetFieldToEdit.getFromDate().isBefore(LocalDate.now().plusDays(1))) {
                     try {
                         if (dataSetApi.editDataSetField(dataSetFieldToEdit.getDataSetId(), dataSetFieldToEdit.getDataRowId(), 8, dataSetFieldToEdit.getTitle()) == 200 && this.dataSetApi.editDataSetField(dataSetFieldToEdit.getDataSetId(), dataSetFieldToEdit.getDataRowId(), 9, dataSetFieldToEdit.getValue()) == 200) {
-                            //dataSetFieldFacade.deleteByRowId(dataSetFieldToEdit.getDataRowId());
-                            //dataSetFieldFacade.save(dataSetFieldToEdit);
                             dataSetFieldFacade.merge(dataSetFieldToEdit);
                             this.updateList();
 

HomeDsBackend/src/main/java/at/htl/web/IndexController.java

@@ -1,15 +1,12 @@
 package at.htl.web;
 
 import at.htl.exceptions.NoConnectionException;
-import at.htl.model.Display;
-import at.htl.xiboClient.DisplayApi;
 import at.htl.xiboClient.StatusApi;
 
-import javax.annotation.PostConstruct;
 import javax.enterprise.inject.Model;
 import javax.inject.Inject;
 import javax.inject.Named;
-import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @Model
 @Named
@@ -18,32 +15,27 @@ public class IndexController {
     @Inject
     StatusApi statusApi;
 
-    @Inject
-    DisplayApi displayApi;
-
-    private boolean isOnline = false;
-
-    @PostConstruct
-    public void init() {
-        try {
-            displayApi.GetAllDisplays();
-        } catch (NoConnectionException e) {
-            e.printStackTrace();
+    private static boolean on;
+
+    private static int cnt = 0;
+
+    private static LocalDateTime lastOnline;
+
+    public boolean isServerOnline() {
+        if (cnt == 0 || (lastOnline.plusMinutes(2).isBefore(LocalDateTime.now()))) {
+            try {
+                cnt++;
+                on = true;
+                lastOnline = LocalDateTime.now();
+                return statusApi.getIsOnline();
+            } catch (NoConnectionException e) {
+                cnt++;
+                on = false;
+                lastOnline = LocalDateTime.now();
+                return false;
+            }
+        } else {
+            return on;
         }
     }
-
-    //region Getter & Setter
-    public boolean isOnline() {
-        try {
-            return statusApi.getIsOnline();
-        } catch (NoConnectionException e) {
-            return false;
-        }
-    }
-
-    public void setOnline(boolean online) {
-        isOnline = online;
-    }
-    //endregion
-
 }

HomeDsBackend/src/main/java/at/htl/web/MediaController.java

@@ -24,14 +24,19 @@ public class MediaController implements Serializable {
     @Inject
     LayoutChangerUtil layoutChangerUtil;
 
-    private List<Media> medias;
+    private static List<Media> medias;
 
-    private List<Media> shortMedias;
+    private static List<Media> shortMedias;
 
     @PostConstruct
     public void init() {
         try {
-            this.updateList();
+            if (medias != null) {
+                //no need for update
+            }
+            else {
+                this.updateList();
+            }
         } catch (NoConnectionException e) {
             e.printStackTrace();
         }

HomeDsBackend/src/main/java/at/htl/xiboClient/DataSetApi.java

@@ -182,12 +182,14 @@ public long getIdForColumnName(long dataSetId, String columnName) throws NoConne
 
     public long editDataSetField(long dataSetId, long dataSetDataId, long dataSetColumnId, String dataSetFieldValue) throws NoConnectionException {
 
+
+
         try {
 
             //Get all Datasets
             HttpURLConnection con = new RequestHelper()
                     .executeRequest(RequestTypeEnum.PUT,
-                            "dataSetColumnId_"+dataSetColumnId+"="+dataSetFieldValue,
+                            "dataSetColumnId_"+dataSetColumnId+"="+replaceCodings(dataSetFieldValue),
                             new RequestHelper().BASE_URL + "api/dataset/data/" + dataSetId+"/"+dataSetDataId,
                             AuthentificationHandler.getTOKEN());
 
@@ -213,6 +215,18 @@ public long editDataSetField(long dataSetId, long dataSetDataId, long dataSetCol
         return -1;
     }
 
+    private String replaceCodings(String dataSetFieldValue) {
+        String finalValue = dataSetFieldValue.replaceAll("Ä","Ä")
+                .replaceAll("ä","ä")
+                .replaceAll("Ö","Ö")
+                .replaceAll("ö","ö")
+                .replaceAll("Ü","Ü")
+                .replaceAll("ü","ü")
+                .replaceAll("ß","&szlig")
+                .replaceAll("&","%26");
+        return finalValue;
+    }
+
     public long addDataSetField(DataSetDataField dataField) throws NoConnectionException {
         try {
 

HomeDsBackend/src/main/java/at/htl/xiboClient/DisplayApi.java

@@ -2,7 +2,6 @@
 
 import at.htl.enums.RequestTypeEnum;
 import at.htl.exceptions.NoConnectionException;
-import at.htl.model.DataSet;
 import at.htl.model.Display;
 import at.htl.utils.AuthentificationHandler;
 import at.htl.utils.RequestHelper;
@@ -44,7 +43,6 @@ public LinkedList<Display> GetAllDisplays() throws NoConnectionException {
             }
 
             JSONArray jsonarray = new JSONArray(response.toString());
-            System.out.println(response.toString());
 
             for (int i = 0; i < jsonarray.length(); i++) {
                 JSONObject jsonObject = jsonarray.getJSONObject(i);
@@ -78,7 +76,7 @@ public void ChangeLayout(long displayGroupId, int layoutId) throws NoConnectionE
             //Get all Datasets
             HttpURLConnection con = new RequestHelper()
                     .executeRequest(RequestTypeEnum.POST,
-                            "layoutId=" + 39,
+                            "layoutId=" + 21,
                             new RequestHelper().BASE_URL + "api/displaygroup/" + 14 + "/action/overlayLayout",
                             AuthentificationHandler.getTOKEN());