Changeset 5258 for branches/WebApplication/MVC2

Timestamp:

01/08/11 14:47:26 (14 years ago)

Author:

wtollsch

Message:

#1198 finished okb admin stucture integration

Location:

branches/WebApplication/MVC2

Files:

• HLWebOKBAdminPlugin/Controllers/AlgorithmClassController.cs (modified) (9 diffs)
• HLWebOKBAdminPlugin/HLWebOKBAdminPlugin.csproj (modified) (3 diffs)
• HLWebOKBAdminPlugin/Views/AlgorithmClass/Create.aspx (added)
• HLWebOKBAdminPlugin/Views/AlgorithmClass/Delete.aspx (added)
• HLWebOKBAdminPlugin/Views/AlgorithmClass/Details.aspx (added)
• HLWebOKBAdminPlugin/Views/AlgorithmClass/Edit.aspx (added)
• HeuristicLabWeb.PluginHost/HLWebPluginHost/Views/AlgorithmClass/Create.aspx (deleted)
• HeuristicLabWeb.PluginHost/HLWebPluginHost/Views/AlgorithmClass/Delete.aspx (deleted)
• HeuristicLabWeb.PluginHost/HLWebPluginHost/Views/AlgorithmClass/Details.aspx (deleted)
• HeuristicLabWeb.PluginHost/HLWebPluginHost/Views/AlgorithmClass/Edit.aspx (deleted)

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

@@ -8 +8 @@
 using System.ServiceModel.Security;
 using HLWebPluginHost.OKBService;
+using System.Diagnostics;
 
 namespace HLWebOKBAdminPlugin.Controllers
@@ -38 +39 @@
             //what happens: generate list of AlgorithmClass and commit the list to the index view
 
-            //get certificated service client
-            OKBService.OKBServiceClient sc = CertificateValidator();
+            
+
+            //get certificated service client
+            OKBService.OKBServiceClient sc = CertificateValidator();
+
+            var tstModel = new AlgorithmClassViewModel {
+                AlgorithmClass = new AlgorithmClass()
+            };
+
+            Debug.WriteLine("tstModel created");
 
             //get list of Algorithm Classes
@@ -68 +77 @@
             };
 
-            return View(viewModel);
+            ViewData["AlgorithmClass"] = viewModel;
+
+            return View();
         }//Details
 
@@ -87 +98 @@
             };
 
-            return View(viewModel);
+            ViewData["AlgorithmClass"] = viewModel;
+
+            return View();
         }//Create
 
@@ -120 +133 @@
                 };
 
-                return View(viewModel);
+                ViewData["AlgorithmClass"] = viewModel;
+
+                return View();
             }
         }//Create - post
@@ -139 +154 @@
                 AlgorithmClass = sc.GetAlgorithmClass(id)
             };
-            return View(viewModel);
+
+            ViewData["AlgorithmClass"] = viewModel;
+
+            return View();
         }//Edit
 
@@ -174 +192 @@
                 };
 
-                return View(viewModel);
+                ViewData["AlgorithmClass"] = viewModel;
+
+                return View();
             }
         }//Edit
@@ -193 +213 @@
                 AlgorithmClass = sc.GetAlgorithmClass(id)
             };
-            return View(viewModel);
+
+            ViewData["AlgorithmClass"] = viewModel;
+
+            return View();
         }//Delete
 
@@ -221 +244 @@
                 };
 
-                return View(viewModel);
+                ViewData["AlgorithmClass"] = viewModel;
+
+                return View();
             }
         }//Delete

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/HLWebOKBAdminPlugin.csproj

@@ -93 +93 @@
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <Compile Include="Helpers\HtmlHelpers.cs" />
     <Compile Include="Models\AccountModels.cs" />
     <Compile Include="Models\AlgorithmClassModel.cs" />
@@ -101 +102 @@
       <DependentUpon>Reference.svcmap</DependentUpon>
     </Compile>
+    <Compile Include="ViewModels\AlgorithmClassViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -126 +128 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
+    <Content Include="Views\AlgorithmClass\Create.aspx" />
+    <Content Include="Views\AlgorithmClass\Delete.aspx" />
+    <Content Include="Views\AlgorithmClass\Details.aspx" />
+    <Content Include="Views\AlgorithmClass\Edit.aspx" />
     <Content Include="Views\AlgorithmClass\Index.aspx" />
     <Content Include="Views\ServiceTest\Index.aspx" />