Changeset 6271

Timestamp:

05/24/11 23:29:21 (14 years ago)

Author:

dkahn

Message:

#1433 Fixed missing files and debugged and fixed a null pointer exception on AlgorithmClass.Description that was caused by invalid values coming from webservice

Location:

branches/WebApplication/MVC2/HLWebOKBAdminPlugin

Files:

• HLWebOKBAdminPlugin.csproj (modified) (4 diffs)
• Service References/OKBAdministrationService (added)
• Service References/OKBAdministrationService/Reference.cs (added)
• Views/Admin/Menu.ascx (modified) (1 diff)
• Views/AlgorithmClass/Detail.aspx (added)
• Views/AlgorithmClass/Index.aspx (modified) (1 diff)
• Web.config (modified) (2 diffs)

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/HLWebOKBAdminPlugin.csproj

@@ -113 +113 @@
   <ItemGroup>
     <Content Include="Global.asax" />
-    <None Include="Properties\DataSources\HLWebPluginHost.OKBAdministrationService.Algorithm.datasource" />
-    <None Include="Properties\DataSources\HLWebPluginHost.OKBAdministrationService.AlgorithmClass.datasource" />
-    <None Include="Properties\DataSources\HLWebPluginHost.OKBAdministrationService.Platform.datasource" />
-    <None Include="Properties\DataSources\HLWebPluginHost.OKBAdministrationService.Problem.datasource" />
-    <None Include="Properties\DataSources\HLWebPluginHost.OKBAdministrationService.ProblemClass.datasource" />
     <EmbeddedResource Include="Views\Admin\Menu.ascx" />
     <None Include="Service References\OKBAdministrationService\AdministrationService.disco" />
@@ -184 +179 @@
     <Content Include="Views\Web.config" />
     <None Include="Service References\OKBAdministrationService\AdministrationService.wsdl" />
-    <None Include="Service References\OKBAdministrationService\AdministrationService.xsd">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="Service References\OKBAdministrationService\AdministrationService1.xsd">
       <SubType>Designer</SubType>
@@ -200 +192 @@
     <Folder Include="App_Data\" />
     <Folder Include="App_LocalResources\" />
+    <Folder Include="Properties\DataSources\" />
     <Folder Include="Resources\" />
     <Folder Include="ViewModels\" />
@@ -208 +201 @@
   <ItemGroup>
     <WCFMetadataStorage Include="Service References\OKBAdministrationService\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Service References\OKBAdministrationService\AdministrationService.xsd">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Choose>

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

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

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

@@ -1 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<dynamic>" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
+
+<%@ Import Namespace="HLWebOKBAdminPlugin.Models" %>
+<%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
+
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-  Index
+    Index
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
 
-    <h2>Index</h2>
+    <h2>AlgorithmClass</h2>
 
+<%  long? id = null;  %>
+    <%: Html.ActionLink("New AlgorithmClass", "Detail", new {id}) %>
+    <%: Html.ActionLink("Order ASC", "SortAsc")%>
+    <%: Html.ActionLink("Order DESC", "SortDesc")%>
+
+    <div style="height:150px; overflow:scroll;">
+        <table>
+            <!--// We get this from the Controller (Index)-->
+            <% foreach (AlgorithmClass p in ((AlgorithmClassModel)Model).AlgorithmClasses) {  %>
+            <tr>
+                <td>
+                    <%: Html.Label(p.Name)%>
+                </td>
+                <td>
+                    <%: Html.Label(p.Description) %>
+                </td>
+                <td>
+                    <%: Html.ActionLink("detail", "Detail", new { p.Id })%>
+                </td>
+                <td>
+                    <%: Html.ActionLink("delete", "Delete",new {p.Id}) %>
+                </td>
+            </tr>
+            <% } %>
+        </table>
+    </div>       
 </asp:Content>

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Web.config

@@ -142 +142 @@
           </security>
         </binding>
+        <binding name="AdministrationService4" closeTimeout="00:01:00"
+          openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
+          bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
+          maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text"
+          textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
+            maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00"
+            enabled="false" />
+          <security mode="Message">
+            <transport clientCredentialType="Windows" proxyCredentialType="None"
+              realm="" />
+            <message clientCredentialType="UserName" negotiateServiceCredential="true"
+              algorithmSuite="Default" />
+          </security>
+        </binding>
       </wsHttpBinding>
     </bindings>
@@ -173 +189 @@
         </identity>
       </endpoint>
+      <endpoint address="http://services.heuristiclab.com/OKB.SPR-3.3/AdministrationService.svc"
+        binding="wsHttpBinding" bindingConfiguration="AdministrationService4"
+        contract="OKBAdministrationService.IAdministrationService" name="AdministrationService4">
+        <identity>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ==" />
+        </identity>
+      </endpoint>
     </client>
   </system.serviceModel>