Merge remote-tracking branch 'origin/dev-1.2' into development

src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Chapters.java

@@ -85,6 +85,31 @@ public final class Chapters {
             return builder.toString();
         }
 
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((this.id == null) ? 0 : this.id.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(final Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            final Chapter other = (Chapter) obj;
+            if (this.id == null) {
+                if (other.id != null)
+                    return false;
+            } else if (!this.id.equals(other.id))
+                return false;
+            return true;
+        }
+
         @Override
         public int compareTo(final Chapter o) {
             if (o == null) {

src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Indicator.java

@@ -270,7 +270,7 @@ public final class Indicator implements Entity {
 
         @Override
         public int compareTo(final Threshold o) {
-            return Double.compare(this.value, (o != null) ? o.value : 0);
+            return Double.compare(this.value, (o != null) ? o.value : -1);
         }
 
     }

src/main/resources/config/application-gui.properties

@@ -17,7 +17,7 @@ sebserver.gui.http.external.scheme=${sebserver.webservice.http.external.scheme}
 sebserver.gui.http.external.servername=${sebserver.webservice.http.external.servername}
 sebserver.gui.http.external.port=${sebserver.webservice.http.external.port}
 
-sebserver.gui.http.webservice.scheme=https
+sebserver.gui.http.webservice.scheme=http
 sebserver.gui.http.webservice.servername=localhost
 sebserver.gui.http.webservice.port=8080
 sebserver.gui.http.webservice.contextPath=${server.servlet.context-path}

src/test/java/ch/ethz/seb/sebserver/gui/service/session/proctoring/ZoomWindowScriptResolverTest.java

@@ -156,6 +156,11 @@ public class ZoomWindowScriptResolverTest {
                         + "                        passWord: config.passWord,\r\n"
                         + "                        success(res) {\r\n"
                         + "                             console.log('JOIN SUCCESS')\r\n"
+                        + "                             ZoomMtg.getAttendeeslist({\r\n"
+                        + "                                success: function (res) {\r\n"
+                        + "                                        console.log(res, \"get getAttendeeslist\");\r\n"
+                        + "                                   }\r\n"
+                        + "                                });\r\n"
                         + "                        },\r\n"
                         + "                        error(res) {\r\n"
                         + "                            console.warn('JOIN ERROR')\r\n"