Changeset 6213

Timestamp:

05/17/11 11:16:41 (13 years ago)

Author:

gschwarz

Message:

#1433 Updated Problem Control/View; Added Algorithm Control/View => bug still exist in SortDesc

Location:

branches/WebApplication/MVC2/HLWebOKBAdminPlugin

Files:

• Controllers/AlgorithmController.cs (added)
• Controllers/ProblemController.cs (modified) (3 diffs)
• Models/AlgorithmModel.cs (modified) (7 diffs)
• Models/ProblemModel.cs (modified) (1 diff)
• Views/Admin/Menu.ascx (modified) (1 diff)

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

@@ -21 +21 @@
         {
             Session["SelectedSubMenu"] = "Problem";
-      ProblemModel pm = new ProblemModel();
+            ProblemModel pm = new ProblemModel();
       return View(pm);
     }
@@ -43 +43 @@
             Session["SelectedSubMenu"] = "Problem";
             ProblemModel pm = new ProblemModel();
-            pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
-            return View("Index",pm);
+
+            //this is code for testing sortorder
+            IOrderedEnumerable<Problem> test = pm.Problems.OrderByDescending(x => x.Name);
+            IList<Problem> test2 = new List<Problem>();
+            foreach(var item in test) {
+                test2.Add(item);
+            }
+            pm.Problems = test2;
+
+            // this should be the right code
+            //pm.Problems = pm.Problems.OrderByDescending(x => x.Name).ToArray<Problem>();
+            return View("Index", pm);
         }
         /// <summary>
@@ -56 +66 @@
             // We use here the ProblemMode, but I think
             // we can also use the Problem class. (?)
-      ProblemModel pm = new ProblemModel();
+            ProblemModel pm = new ProblemModel();
             if(id == null)
                 pm.Problem = new Problem();

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

@@ -6 +6 @@
 using HLWebOKBAdminPlugin.Helpers;
 
-namespace HLWebOKBAdminPlugin.Models {
+namespace HLWebOKBAdminPlugin.Models
+{
     public class AlgorithmModel {
-        
+
         public String SelectedSubMenu { get; set; }
-        public IList<Algorithm> Algorithms { get { return AlgorithmsGetAll(); } }
+        public IList<Algorithm> Algorithms { get { return AlgorithmGetAll(); } set { ;} }
+        public IList<AlgorithmClass> AlgorithmClasses { get { return AlgorithmClassGetAll(); } }
+        public IList<Platform> Platforms { get { return PlatformsGetAll(); } }
 
         public Algorithm Algorithm { get; set; }
@@ -18 +21 @@
         }//AlgorithmModel
 
-        //***************************************Algorithms*************************************************
+        //***************************************Algorithms***************************************************
         private IList<Platform> PlatformsGetAll() {
             AdministrationServiceClient adminClient = Admin.GetClientFactory();
@@ -32 +35 @@
 
             return platformList;
-        }//ProblemClassGetAll
+        }//AlgorithmClassGetAll
 
-        private IList<ProblemClass> ProblemClassGetAll() {
+        private IList<AlgorithmClass> AlgorithmClassGetAll() {
             AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
-            IList<ProblemClass> problemClassList = new List<ProblemClass>();
+            IList<AlgorithmClass> algorithmClassList = new List<AlgorithmClass>();
 
             if (adminClient != null) {
-                ProblemClass[] problemClasses = adminClient.GetProblemClasses();
-                foreach (ProblemClass pc in problemClasses) {
-                    problemClassList.Add(pc);
+                AlgorithmClass[] algorithmClasses = adminClient.GetAlgorithmClasses();
+                foreach(AlgorithmClass ac in algorithmClasses) {
+                    algorithmClassList.Add(ac);
                 }
             }//if (adminClient != null)
 
-            return problemClassList;
-        }//ProblemClassGetAll
+            return algorithmClassList;
+        }//AlgorithmClassGetAll
 
-        //get all algorithms
-        private IList<Algorithm> AlgorithmsGetAll() {
+        private IList<Algorithm> AlgorithmGetAll() {
             AdministrationServiceClient adminClient = Admin.GetClientFactory();
 
@@ -57 +59 @@
             if (adminClient != null) {
                 Algorithm[] algorithm = adminClient.GetAlgorithms();
-                foreach (Algorithm al in algorithm) {
-                    algorithmList.Add(al);
+                foreach(Algorithm alg in algorithm) {
+                    algorithmList.Add(alg);
 
                 }
@@ -64 +66 @@
 
             return algorithmList;
-        }//AlgorithmsGetAll
+        }//AlgorithmGetAll
 
         private long AddAlgorithm(Algorithm algorithm) {
@@ -92 +94 @@
                 }
                 else {
-                    Algorithm al = adminClient.GetAlgorithm(algorithm.Id);
+                    Algorithm alg = adminClient.GetAlgorithm(algorithm.Id);
 
-                    if (al != null) {
+                    if (alg != null) {
                         adminClient.UpdateAlgorithm(algorithm);
                         return algorithm.Id;
@@ -103 +105 @@
             return 0;
         }//SaveAlgorithm
-        
     }
 }

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

@@ -11 +11 @@
 
         public String SelectedSubMenu { get; set; }
-        public IList<Problem> Problems { get { return ProblemsGetAll(); } set { ;} }
+        public IList<Problem> Problems {
+            get { return ProblemsGetAll(); }
+            set { ;}
+        }
         public IList<ProblemClass> ProblemClasses { get { return ProblemClassGetAll(); } }
         public IList<Platform> Platforms { get { return PlatformsGetAll(); } }

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Admin/Menu.ascx

@@ -6 +6 @@
 </li>
 <li <% if(Session["SelectedSubMenu"] == "Algorithm") {%> class="selected" <%}%>>
-    <%: Html.ActionLink("Algorithm", "Algorithm", "Admin") %>
+    <%: Html.ActionLink("Algorithm", "Index", "Algorithm")%>
 </li>
 <li <% if(Session["SelectedSubMenu"] == "ProblemClass") {%> class="selected" <%}%>>