work

Author: thomaswoehlke

src/main/resources/templates/layout/page.html

@@ -160,11 +160,17 @@
 			var srcId = ev.dataTransfer.getData("task").split("_")[1];
 			var targetProjectIdInfo = ev.target.id;
 			var targetProjectId = targetProjectIdInfo.split("_")[1];
+      //alert("srcType "+srcType);
+      //alert("srcId "+srcId);
+      //alert("targetProjectIdInfo "+targetProjectIdInfo);
+      //alert("targetProjectId "+targetProjectId);
 			if(srcType == 'task') {
 				var myUrl = '[(@{/taskstate/task/})]' + srcId + '/move/to/project/' + targetProjectId;
+        alert("myUrl "+myUrl);
 				window.location.replace(myUrl);
 			} else if(srcType == 'project') {
 				var myUrl = '[(@{/project/})]' + srcId + '/project/move/to/project/' + targetProjectId;
+        alert("myUrl "+myUrl);
 				window.location.replace(myUrl);
 			}
 		}

src/main/resources/templates/layout/projects.html

@@ -10,17 +10,16 @@
       <nav>
         <ul id="rootProject" style="list-style: none;">
           <li>
-            <span id="tw-project-submenu-root">
-                <a th:href="@{/project/root}" id="project_0"
+            <span id="tw-project-submenu-root" id="project_0"
+                  ondrop="drop2project(event)" ondragover="allowDrop2Project(event)">
+                <a th:href="@{/project/root}"
                    th:if="${thisProject != null or taskstateType != null}"
-                   ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
                    class="m-2 btn btn-outline-dark btn-sm">
                     <i class="fas fa-folder-open"></i>
                     <span th:text="#{right.nav.projects}">Projects</span>
                 </a>
-                <a th:href="@{/project/root}" id="project_0"
+                <a th:href="@{/project/root}"
                    th:if="${thisProject == null and taskstateType == null}"
-                 ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
                  class="m-2 btn btn-dark btn-sm">
                     <i class="fas fa-folder-open"></i>
                     <span th:text="#{right.nav.projects}">Projects</span>
@@ -41,19 +40,20 @@
 
 <ul th:fragment="tw-project-submenu(projectList, thisProject)" style="list-style: none;">
   <li th:each="project : ${projectList}">
-    <span th:if="${project == thisProject}" class="btn btn-dark btn-sm">
+    <span th:id="'project_' + ${project.id}"
+          th:if="${project == thisProject}"
+          ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
+          draggable="true" ondragstart="dragProject(event)"
+          class="btn btn-dark btn-sm">
         <i class="fa-solid fa-diagram-project"></i>
-        <strong th:id="'project_' + ${project.id}"
-                th:text="${project.name}"
-                ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
-                draggable="true" ondragstart="dragProject(event)">
-        </strong>
+        <strong th:text="${project.name}"></strong>
     </span>
-    <span th:if="${project != thisProject}">
-      <a th:id="'project_' + ${project.id}"
-         th:href="@{/project/{id}(id=${project.id})}"
-         ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
-         draggable="true" ondragstart="dragProject(event)" class="m-2 btn btn-outline-dark btn-sm">
+    <span th:id="'project_' + ${project.id}"
+          th:if="${project != thisProject}"
+          ondrop="drop2project(event)" ondragover="allowDrop2Project(event)"
+          draggable="true" ondragstart="dragProject(event)"
+          class="m-2 btn btn-outline-dark btn-sm">
+      <a th:href="@{/project/{id}(id=${project.id})}">
         <i class="fa-solid fa-diagram-project"></i>
         <span th:text="${project.name}"></span>
       </a>