Changeset 6153 for branches/WebApplication

Timestamp:

05/07/11 14:17:42 (14 years ago)

Author:

gschwarz

Message:

#1433 Updated Problem Control/View

Location:

branches/WebApplication/MVC2/HLWebOKBAdminPlugin

Files:

• Controllers/ProblemController.cs (modified) (3 diffs)
• Models/ProblemModel.cs (modified) (1 diff)
• Service References/OKBAdministrationService (deleted)
• Views/Problem/Detail.aspx (modified) (2 diffs)
• Views/Problem/Index.aspx (modified) (2 diffs)

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/ProblemController.cs

@@ -25 +25 @@
     }
 
+        public ActionResult SortAsc() {
+            Session["SelectedSubMenu"] = "Problem";
+            ProblemModel pm = new ProblemModel();
+            pm.Problems.OrderBy(x => x.Name);
+            return View("Index",pm);
+        }
+
+        public ActionResult SortDesc() {
+            Session["SelectedSubMenu"] = "Problem";
+            ProblemModel pm = new ProblemModel();
+            pm.Problems.OrderByDescending(x => x.Name);
+            return View("Index",pm);
+        }
         /// <summary>
         /// Controller for Detail View
@@ -30 +43 @@
         /// <param name="p"></param>
         /// <returns></returns>
-    public ActionResult Detail(long id)
+    public ActionResult Detail(long? id)
         {
             Session["SelectedSubMenu"] = "Problem";
@@ -36 +49 @@
             // we can also use the Problem class. (?)
       ProblemModel pm = new ProblemModel();
-            if(id == 0)
+            if(id == null)
                 pm.Problem = new Problem();
             else
-                pm.Problem = (Problem)pm.Problems.Where(x => x.Id.Equals(id)).FirstOrDefault();
+                pm.Problem = (Problem)pm.Problems.Where(x => x.Id.Equals((long)id)).FirstOrDefault();
       return View(pm);
     }
+
+        public ActionResult Delete(long id) {
+            Session["SelectedSubMenu"] = "Problem";
+            // We use here the ProblemMode, but I think
+            // we can also use the Problem class. (?)
+            ProblemModel pm = new ProblemModel();
+            if(id != 0) {
+                pm.Problem = (Problem)pm.Problems.Where(x => x.Id.Equals(id)).FirstOrDefault();
+//                pm.DeleteProblem();
+            }
+            return View(pm);
+        }
 
         public ActionResult SaveChanges(FormCollection collection) {            

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Models/ProblemModel.cs

@@ -52 +52 @@
         }
 
-        public void CreateProblem(Problem problem) {
-            AdministrationServiceClient adminClient = Admin.GetClientFactory("okbtester", "okbtester");
-            adminClient.AddProblem(problem);
-        }
 
     }

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Problem/Detail.aspx

@@ -61 +61 @@
                 <select name="ProblemClassId">
                     <% foreach(ProblemClass pc in ((ProblemModel)Model).ProblemClasses) {  %>
+                        <% if(p.ProblemClassId == pc.Id) { %>
+                            <option selected="selected" value="<%=pc.Id%>"><%=pc.Name%></option>
+                        <% } else { %>
                             <option value="<%=pc.Id%>"><%=pc.Name%></option>
+                        <% } %>
                     <% } %>
                 </select>
@@ -73 +77 @@
                 <select name="PlattformId">
                     <% foreach(Platform pc in ((ProblemModel)Model).Plattforms) {  %>
+                        <% if(p.PlatformId == pc.Id) { %>
+                            <option selected="selected" value="<%=pc.Id%>"><%=pc.Name%></option>
+                        <% } else { %>
                             <option value="<%=pc.Id%>"><%=pc.Name%></option>
+                        <% } %>
                     <% } %>
                 </select>

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Problem/Index.aspx

@@ -8 +8 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
     <h2>Problems</h2>
+    
+    
+    
+    <%  long? id = null;  %>
+    <%: Html.ActionLink("New Problem", "Detail", new {id}) %>
+    <%: Html.ActionLink("Order ASC", "SortAsc")%>
+    <%: Html.ActionLink("Order DESC", "SortDesc")%>
+
     <div style="height:150px; overflow:scroll;">
         <table>
@@ -22 +30 @@
                     <%: Html.Label(p.DataTypeName)%>
                 </td>
+                <td>
+                     <%: Html.ActionLink("delete", "Detail",new {p.Id}) %>
+                </td>
             </tr>
             <% } %>
         </table>
-    </div>
-
-      
-    <h2>Create new Problem</h2>
- 
-       
+    </div>       
 </asp:Content>