- created refactoring branch

- started working on group finding prototyp (basic group management prototyp for development - not advanced groupfinding i.e. mirjams project)

- created refactoring branch
45f4c5f0 · Julian Dehne · eed4122c · eed4122c · 45f4c5f0 · 45f4c5f0
Commit 45f4c5f0 authored 6 years ago by Julian Dehne
--- a/gemeinsamforschen/src/main/webapp/munchkin/js/munschkinloader.js
+++ b/gemeinsamforschen/src/main/webapp/munchkin/js/munschkinloader.js
-/**
- * Created by dehne on 25.04.2018.
- */
-
-function xmlToString(xmlData) {
-
-    var xmlString;
-    //IE
-    if (window.ActiveXObject) {
-        xmlString = xmlData.xml;
-    }
-    // code for Mozilla, Firefox, Opera, etc.
-    else {
-        xmlString = (new XMLSerializer()).serializeToString(xmlData);
-    }
-    return xmlString;
-}
-
-
-$(document).ready(function () {
-    $.ajax({
-        type: "get",
-        url: "http://localhost:8080/gemeinsamforschen/rest/api/munschkin/1",
-        dataType: "xml",
-        success: function (data) {
-            /* handle data here */
-            //var munschkin = $.parseXML(data)
-            $("#munschkin").append(xmlToString(data));
-        },
-        error: function (xhr, status) {
-            alert("Server down .... ogottogottogottt")
-        }
-    });
-
-});
-
--- a/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
@@ -6,6 +6,8 @@
 <!DOCTYPE html>
 <html>

+<!-- TODO refactor @Sven: bitte nutze einen Unterordner für dein Modul z.B. webapp/annotation/ -->
+
 <head>
    <omniDependencies:omniDependencies/>


--- a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
@@ -3,6 +3,9 @@
 <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
 <%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>

+<!-- TODO refactor @Sven: bitte nutze einen Unterordner für dein Modul z.B. webapp/annotation/ -->
+
+
 <!DOCTYPE html>
 <html lang="en">
 <head>