Changeset 6162 for branches/WebApplication/MVC2

Timestamp:

05/07/11 15:35:44 (14 years ago)

Author:

gschwarz

Message:

#1433 Updated Problem Control/View

Location:

branches/WebApplication/MVC2/HLWebOKBAdminPlugin

Files:

• Controllers/ProblemController.cs (modified) (5 diffs)
• Views/Admin/AlgorithmClass.aspx (modified) (2 diffs)
• Views/Problem/Detail.aspx (modified) (1 diff)
• Views/Problem/Index.aspx (modified) (1 diff)

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

@@ -25 +25 @@
     }
 
+        /// <summary>
+        /// Controller for Index View
+        /// </summary>
+        /// <returns></returns>
         public ActionResult SortAsc() {
             Session["SelectedSubMenu"] = "Problem";
             ProblemModel pm = new ProblemModel();
-            pm.Problems.OrderBy(x => x.Name);
+            pm.Problems = pm.Problems.OrderBy(x => x.Name).ToList<Problem>();
             return View("Index",pm);
         }
 
+        /// <summary>
+        /// Controller for Index View
+        /// </summary>
+        /// <returns></returns>
         public ActionResult SortDesc() {
             Session["SelectedSubMenu"] = "Problem";
             ProblemModel pm = new ProblemModel();
-            pm.Problems.OrderByDescending(x => x.Name);
+            pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
             return View("Index",pm);
         }
@@ -56 +64 @@
     }
 
+        /// <summary>
+        /// Controller for Index View
+        /// </summary>
+        /// <returns></returns>
         public ActionResult Delete(long id) {
             Session["SelectedSubMenu"] = "Problem";
@@ -62 +74 @@
             ProblemModel pm = new ProblemModel();
             if(id != 0) {
-                pm.Problem = (Problem)pm.Problems.Where(x => x.Id.Equals(id)).FirstOrDefault();
-//                pm.DeleteProblem();
+                pm.DeleteProblem(id);
             }
-            return View(pm);
+            return View("Index", pm);
         }
 
+        /// <summary>
+        /// Controller for Detail View
+        /// </summary>
+        /// <returns></returns>
         public ActionResult SaveChanges(FormCollection collection) {            
             long problemId = long.Parse(collection.Get("ProblemId"));
@@ -78 +93 @@
             // Later, we will get the runs from the session ...
             ProblemModel pm = new ProblemModel();
-            if( problemId != 0 )
+            if(problemId != 0)
                 pm.Problem = (Problem)pm.Problems.Where(x => x.Id.Equals(problemId)).FirstOrDefault();
 
@@ -84 +99 @@
             pm.Problem.Description = problemDescription;
             pm.Problem.DataTypeName = problemDataTypeName;
+            pm.Problem.DataTypeTypeName = "";
             pm.Problem.ProblemClassId = problemClassId;
             pm.Problem.PlatformId = platformId;

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Admin/AlgorithmClass.aspx

@@ -1 +1 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
 
-<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
-   <% Html.RenderAction("Menu"); %>
-</asp:Content>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-  AlgorithmClass
+    AlgorithmClass
 </asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
+    <form id="formAlgorithmClass" runat="server">
+    <h2>
+        AlgorithmClass</h2>
+    <asp:ListBox ID="lbxAlgorithmClasses" runat="server" DataTextField="Name" DataValueField="Id"
+        Height="350px" Style="margin-top: 0px" Width="240px" DataSourceID="odsAlgorithmClasses">
+    </asp:ListBox>
+    <asp:ObjectDataSource ID="odsAlgorithmClasses" runat="server" SelectMethod="AlgorithmClassGetAll"
+        TypeName="HLWebOKBAdminPlugin.Models.AdminModel"></asp:ObjectDataSource>
 
-<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-
-    <form id="formAlgorithmClass" runat="server">
-
-    <h2>AlgorithmClass</h2>    
-
-     <asp:ListBox ID="lbxAlgorithmClasses" runat="server"  
-            DataTextField="Name" DataValueField="Id" Height="350px" style="margin-top: 0px" 
-            Width="240px" DataSourceID="odsAlgorithmClasses">
-        </asp:ListBox>
-    
-    <asp:ObjectDataSource ID="odsAlgorithmClasses" runat="server" 
-        SelectMethod="AlgorithmClassGetAll" 
-        TypeName="HLWebOKBAdminPlugin.Models.AdminModel"></asp:ObjectDataSource>
-    
+            <asp:Button ID="Test" runat="server" Text="TestText" 
+        onclick="Test_Click"/>
     <p>
         <%: Html.ActionLink("Create New", "Create") %>
@@ -29 +22 @@
 
     </form>
-
 </asp:Content>
-

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

@@ -72 +72 @@
         <tr>
             <td>
-                Plattforms:
+                Platform:
             </td>
             <td>
-                <select name="PlattformId">
-                    <% foreach(Platform pc in ((ProblemModel)Model).Plattforms) {  %>
+                <select name="PlatformId">
+                    <% foreach(Platform pc in ((ProblemModel)Model).Platforms) {  %>
                         <% if(p.PlatformId == pc.Id) { %>
                             <option selected="selected" value="<%=pc.Id%>"><%=pc.Name%></option>

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

@@ -31 +31 @@
                 </td>
                 <td>
-                     <%: Html.ActionLink("delete", "Detail",new {p.Id}) %>
+                    <%: Html.ActionLink("delete", "Delete",new {p.Id}) %>
                 </td>
             </tr>