Changeset 3022

Timestamp:

03/14/10 20:59:36 (15 years ago)

Author:

kgrading

Message:

added the calendar in the dal and the server console. Works on every Resource (Group / Client) (#908)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Common/3.2/Calendar.DayView.dll (deleted)
• HeuristicLab.Hive.Client.Common/3.2/HeuristicLab.Hive.Client.Common-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Client.Console/3.2/HeuristicLab.Hive.Client.Console-3.2.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Client.Console/3.2/RecurrentEvent.cs (deleted)
• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/3.2/HeuristicLab.Hive.Client.Core-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/BusinessObjects/AppointmentDto.cs (added)
• HeuristicLab.Hive.Contracts/3.2/Calendar.DayView.dll (added)
• HeuristicLab.Hive.Contracts/3.2/HeuristicLab.Hive.Contracts-3.2.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Contracts/3.2/Interfaces/IClientManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/RecurrentEvent.cs (added)
• HeuristicLab.Hive.Server.Console/3.2/CgCalendar.Designer.cs (added)
• HeuristicLab.Hive.Server.Console/3.2/CgCalendar.cs (added)
• HeuristicLab.Hive.Server.Console/3.2/CgCalendar.resx (added)
• HeuristicLab.Hive.Server.Console/3.2/HeuristicLab.Hive.Server.Console-3.2.csproj (modified) (5 diffs)
• HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.Designer.cs (modified) (18 diffs)
• HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.resx (modified) (7 diffs)
• HeuristicLab.Hive.Server.Console/3.2/Recurrence.Designer.cs (added)
• HeuristicLab.Hive.Server.Console/3.2/Recurrence.cs (added)
• HeuristicLab.Hive.Server.Console/3.2/Recurrence.resx (added)
• HeuristicLab.Hive.Server.Core/3.2/ClientManager.cs (modified) (7 diffs)
• HeuristicLab.Hive.Server.Core/3.2/DaoLocator.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.DataAccess/3.2/HeuristicLab.Hive.Server.DataAccess-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Server.DataAccess/3.2/IUptimeCalendarDao.cs (added)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml (modified) (2 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml.layout (modified) (7 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.designer.cs (modified) (9 diffs)
• HeuristicLab.Hive.Server.LINQDataAccess/3.2/UptimeCalendarDao.cs (added)

trunk/sources/HeuristicLab.Hive.Client.Common/3.2/HeuristicLab.Hive.Client.Common-3.2.csproj

@@ -67 +67 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Calendar.DayView, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\Calendar.DayView.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

trunk/sources/HeuristicLab.Hive.Client.Console/3.2/HeuristicLab.Hive.Client.Console-3.2.csproj

@@ -70 +70 @@
     <Reference Include="Calendar.DayView, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\HeuristicLab.Hive.Client.Common\3.2\Calendar.DayView.dll</HintPath>
+      <HintPath>..\..\HeuristicLab.Hive.Contracts\3.2\Calendar.DayView.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -144 +144 @@
       <DependentUpon>Recurrence.cs</DependentUpon>
     </Compile>
-    <Compile Include="RecurrentEvent.cs" />
     <Compile Include="Service References\ClientService\Reference.cs">
       <AutoGen>True</AutoGen>

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

@@ -104 +104 @@
         DetermineAction(container);
       }
-      Console.WriteLine("ended!");
+      System.Console.WriteLine("ended");
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/HeuristicLab.Hive.Client.Core-3.2.csproj

@@ -68 +68 @@
     <Reference Include="Calendar.DayView, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\HeuristicLab.Hive.Client.Common\3.2\Calendar.DayView.dll</HintPath>
+      <HintPath>..\..\HeuristicLab.Hive.Contracts\3.2\Calendar.DayView.dll</HintPath>
     </Reference>
     <Reference Include="System" />

trunk/sources/HeuristicLab.Hive.Contracts/3.2/HeuristicLab.Hive.Contracts-3.2.csproj

@@ -87 +87 @@
   <ItemGroup>
     <Compile Include="ApplicationConstants.cs" />
+    <Compile Include="BusinessObjects\AppointmentDto.cs" />
     <Compile Include="BusinessObjects\CachedHivePluginInfoDto.cs" />
     <Compile Include="BusinessObjects\ClientGroupDto.cs" />
@@ -100 +101 @@
     <Compile Include="BusinessObjects\ClientDto.cs" />
     <Compile Include="BusinessObjects\ClientConfigDto.cs" />
+    <Compile Include="RecurrentEvent.cs" />
     <Compile Include="ResponseSerializedJob.cs" />
     <Compile Include="MultiStream.cs" />

trunk/sources/HeuristicLab.Hive.Contracts/3.2/Interfaces/IClientManager.cs

@@ -55 +55 @@
     [OperationContract]
     ResponseList<UpTimeStatisticsDto> GetAllUpTimeStatistics();
+    [OperationContract]
+    ResponseList<AppointmentDto> GetUptimeCalendarForResource(Guid guid);
+
+    [OperationContract]
+    Response SetUptimeCalendarForResource(Guid guid, IEnumerable<AppointmentDto> appointments);
   }
 }

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HeuristicLab.Hive.Server.Console-3.2.csproj

@@ -68 +68 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Calendar.DayView, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\HeuristicLab.Hive.Contracts\3.2\Calendar.DayView.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -107 +111 @@
       <DependentUpon>AddProject.cs</DependentUpon>
     </Compile>
+    <Compile Include="CgCalendar.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CgCalendar.Designer.cs">
+      <DependentUpon>CgCalendar.cs</DependentUpon>
+    </Compile>
     <Compile Include="Changes.cs" />
     <Compile Include="HiveServerConsole.cs">
@@ -139 +149 @@
       <DependentUpon>AddProject.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CgCalendar.resx">
+      <DependentUpon>CgCalendar.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="HiveServerConsole.resx">
       <DependentUpon>HiveServerConsole.cs</DependentUpon>
@@ -153 +166 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Recurrence.resx">
+      <DependentUpon>Recurrence.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -170 +187 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="Recurrence.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Recurrence.Designer.cs">
+      <DependentUpon>Recurrence.cs</DependentUpon>
     </Compile>
     <Compile Include="ServiceLocator.cs" />

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.Designer.cs

@@ -88 +88 @@
       this.tcManagementConsole = new System.Windows.Forms.TabControl();
       this.checkBox1 = new System.Windows.Forms.CheckBox();
+      this.menuItemOpenCalendar = new System.Windows.Forms.ToolStripMenuItem();
       this.menuStrip1.SuspendLayout();
       this.plClientDetails.SuspendLayout();
@@ -130 +131 @@
             this.closeToolStripMenuItem});
       this.informationToolStripMenuItem.Name = "informationToolStripMenuItem";
-      this.informationToolStripMenuItem.Size = new System.Drawing.Size(81, 20);
+      this.informationToolStripMenuItem.Size = new System.Drawing.Size(90, 20);
       this.informationToolStripMenuItem.Text = "Management";
       // 
@@ -137 +138 @@
       this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem";
       this.refreshToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
-      this.refreshToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+      this.refreshToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
       this.refreshToolStripMenuItem.Text = "Refresh";
       this.refreshToolStripMenuItem.Click += new System.EventHandler(this.Refresh_Click);
@@ -144 +145 @@
       // 
       this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
-      this.closeToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+      this.closeToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
       this.closeToolStripMenuItem.Text = "Close";
       this.closeToolStripMenuItem.Click += new System.EventHandler(this.Close_Click);
@@ -155 +156 @@
             this.projectToolStripMenuItem});
       this.addToolStripMenuItem.Name = "addToolStripMenuItem";
-      this.addToolStripMenuItem.Size = new System.Drawing.Size(38, 20);
+      this.addToolStripMenuItem.Size = new System.Drawing.Size(41, 20);
       this.addToolStripMenuItem.Text = "Add";
       // 
@@ -162 +163 @@
       this.jobToolStripMenuItem.Name = "jobToolStripMenuItem";
       this.jobToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.J)));
-      this.jobToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+      this.jobToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
       this.jobToolStripMenuItem.Text = "Job";
       this.jobToolStripMenuItem.Click += new System.EventHandler(this.AddJob_Click);
@@ -170 +171 @@
       this.groupToolStripMenuItem.Name = "groupToolStripMenuItem";
       this.groupToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G)));
-      this.groupToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+      this.groupToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
       this.groupToolStripMenuItem.Text = "Group";
       this.groupToolStripMenuItem.Click += new System.EventHandler(this.groupToolStripMenuItem_Click);
@@ -178 +179 @@
       this.projectToolStripMenuItem.Name = "projectToolStripMenuItem";
       this.projectToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
-      this.projectToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+      this.projectToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
       this.projectToolStripMenuItem.Text = "Project";
       this.projectToolStripMenuItem.Click += new System.EventHandler(this.projectToolStripMenuItem_Click);
@@ -189 +190 @@
             this.listToolStripMenuItem});
       this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
-      this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 20);
+      this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
       this.viewToolStripMenuItem.Text = "View";
       // 
@@ -198 +199 @@
       this.largeIconsToolStripMenuItem.Name = "largeIconsToolStripMenuItem";
       this.largeIconsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D1)));
-      this.largeIconsToolStripMenuItem.Size = new System.Drawing.Size(179, 22);
+      this.largeIconsToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
       this.largeIconsToolStripMenuItem.Text = "Large Icons";
       this.largeIconsToolStripMenuItem.Click += new System.EventHandler(this.largeIconsToolStripMenuItem_Click);
@@ -206 +207 @@
       this.smallIconsToolStripMenuItem.Name = "smallIconsToolStripMenuItem";
       this.smallIconsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D2)));
-      this.smallIconsToolStripMenuItem.Size = new System.Drawing.Size(179, 22);
+      this.smallIconsToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
       this.smallIconsToolStripMenuItem.Text = "Small Icons";
       this.smallIconsToolStripMenuItem.Click += new System.EventHandler(this.smallIconsToolStripMenuItem_Click);
@@ -214 +215 @@
       this.listToolStripMenuItem.Name = "listToolStripMenuItem";
       this.listToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D3)));
-      this.listToolStripMenuItem.Size = new System.Drawing.Size(179, 22);
+      this.listToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
       this.listToolStripMenuItem.Text = "List";
       this.listToolStripMenuItem.Click += new System.EventHandler(this.listToolStripMenuItem_Click);
@@ -547 +548 @@
             this.menuItemGetSnapshot});
       this.contextMenuJob.Name = "contextMenuJob";
-      this.contextMenuJob.Size = new System.Drawing.Size(151, 48);
+      this.contextMenuJob.Size = new System.Drawing.Size(145, 48);
       // 
       // menuItemAbortJob
       // 
       this.menuItemAbortJob.Name = "menuItemAbortJob";
-      this.menuItemAbortJob.Size = new System.Drawing.Size(150, 22);
+      this.menuItemAbortJob.Size = new System.Drawing.Size(144, 22);
       this.menuItemAbortJob.Text = "Abort";
       // 
@@ -558 +559 @@
       // 
       this.menuItemGetSnapshot.Name = "menuItemGetSnapshot";
-      this.menuItemGetSnapshot.Size = new System.Drawing.Size(150, 22);
+      this.menuItemGetSnapshot.Size = new System.Drawing.Size(144, 22);
       this.menuItemGetSnapshot.Text = "Get Snapshot";
       // 
@@ -653 +654 @@
       this.contextMenuGroup.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuItemAddGroup,
-            this.menuItemDeleteGroup});
+            this.menuItemDeleteGroup,
+            this.menuItemOpenCalendar});
       this.contextMenuGroup.Name = "contextMenuJob";
-      this.contextMenuGroup.Size = new System.Drawing.Size(149, 48);
+      this.contextMenuGroup.Size = new System.Drawing.Size(154, 92);
       // 
       // menuItemAddGroup
       // 
       this.menuItemAddGroup.Name = "menuItemAddGroup";
-      this.menuItemAddGroup.Size = new System.Drawing.Size(148, 22);
+      this.menuItemAddGroup.Size = new System.Drawing.Size(153, 22);
       this.menuItemAddGroup.Text = "Add Group";
       // 
@@ -666 +668 @@
       // 
       this.menuItemDeleteGroup.Name = "menuItemDeleteGroup";
-      this.menuItemDeleteGroup.Size = new System.Drawing.Size(148, 22);
+      this.menuItemDeleteGroup.Size = new System.Drawing.Size(153, 22);
       this.menuItemDeleteGroup.Text = "Delete Group";
       // 
@@ -703 +705 @@
       this.checkBox1.Text = "checkBox1";
       this.checkBox1.UseVisualStyleBackColor = true;
+      // 
+      // menuItemOpenCalendar
+      // 
+      this.menuItemOpenCalendar.Name = "menuItemOpenCalendar";
+      this.menuItemOpenCalendar.Size = new System.Drawing.Size(153, 22);
+      this.menuItemOpenCalendar.Text = "Open Calendar";
       // 
       // HiveServerManagementConsole
@@ -810 +818 @@
     private System.Windows.Forms.ToolStripMenuItem groupToolStripMenuItem;
     private System.Windows.Forms.ToolStripMenuItem projectToolStripMenuItem;
+    private System.Windows.Forms.ToolStripMenuItem menuItemOpenCalendar;
   }
 }

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs

@@ -129 +129 @@
       };
 
+      menuItemOpenCalendar.Click += (s, e) => {
+                                      if (tvClientControl.SelectedNode != null) {
+                                        CgCalendar cal = new CgCalendar(((ClientGroupDto)tvClientControl.SelectedNode.Tag).Id);                                        
+                                        cal.Show();
+                                      }
+                                    };
+
+
       // drag item to treeview
       lvClientControl.ItemDrag += delegate(object sender, ItemDragEventArgs e) {
@@ -683 +691 @@
           contextMenuGroup.Items.Add(menuItemAddGroup);
           contextMenuGroup.Items.Add(menuItemDeleteGroup);
+          contextMenuGroup.Items.Add(menuItemOpenCalendar);
         }
       } else {

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.resx

@@ -129 +129 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo
-        FwAAAk1TRnQBSQFMAgEBBAEAAQkBAAEEAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        FwAAAk1TRnQBSQFMAgEBBAEAAQwBAAEMAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABgAMAAUADAAEBAQABCAYAASAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
@@ -239 +239 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO
-        DgAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DgAAAk1TRnQBSQFMAgEBAwEAAQwBAAEMAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
@@ -312 +312 @@
     <value>
         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
-        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
+        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
+        ysmLkjulowAAAABJRU5ErkJggg==
 </value>
   </data>
@@ -342 +342 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy
-        DAAAAk1TRnQBSQFMAgEBBAEAAQkBAAEEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DAAAAk1TRnQBSQFMAgEBBAEAAQwBAAEMAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
@@ -398 +398 @@
 </value>
   </data>
-  <metadata name="updaterWoker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>388, 41</value>
-  </metadata>
   <metadata name="contextMenuJob.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>246, 40</value>
@@ -412 +409 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABq
-        CQAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAwEAAQwBAAEMAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
@@ -455 +452 @@
 </value>
   </data>
+  <metadata name="updaterWoker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>388, 41</value>
+  </metadata>
 </root>

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientManager.cs

@@ -1 +1 @@
 #region License Information
+
 /* HeuristicLab
  * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -18 +19 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #endregion
 
@@ -33 +35 @@
 
 namespace HeuristicLab.Hive.Server.Core {
-  class ClientManager: IClientManager {
-    
-    //ISessionFactory factory;
-    List<ClientGroup> clientGroups;
+  internal class ClientManager : IClientManager {
+    private List<ClientGroup> clientGroups;
 
     public ClientManager() {
-      //factory = ServiceLocator.GetSessionFactory();
-      
       clientGroups = new List<ClientGroup>();
     }
@@ -51 +49 @@
     /// <returns></returns>
     public ResponseList<ClientDto> GetAllClients() {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      try {
-        
-        IClientAdapter clientAdapter =
-          session.GetDataAdapter<ClientDto, IClientAdapter>();*/
-
-        ResponseList<ClientDto> response = new ResponseList<ClientDto>();
-
-        response.List = new List<ClientDto>(DaoLocator.ClientDao.FindAll());
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_ALL_CLIENTS;
-        response.Success = true;
-
-        return response;
-      /*}
-      finally {
-        if (session != null)
-          session.EndSession();
-      }*/
+      ResponseList<ClientDto> response = new ResponseList<ClientDto>();
+
+      response.List = new List<ClientDto>(DaoLocator.ClientDao.FindAll());
+      response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_ALL_CLIENTS;
+      response.Success = true;
+
+      return response;
     }
 
@@ -77 +63 @@
     /// <returns></returns>
     public ResponseList<ClientGroup> GetAllClientGroups() {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      try {
-        IClientGroupAdapter clientGroupAdapter =
-          session.GetDataAdapter<ClientGroup, IClientGroupAdapter>();
-        IClientAdapter clientAdapter =
-          session.GetDataAdapter<ClientDto, IClientAdapter>();*/
-        ResponseList<ClientGroup> response = new ResponseList<ClientGroup>();
-
-        List<ClientGroup> allClientGroups = new List<ClientGroup>(DaoLocator.ClientGroupDao.FindAllWithSubGroupsAndClients());
-        ClientGroup emptyClientGroup = new ClientGroup();
-        IEnumerable<ClientDto> groupLessClients = DaoLocator.ClientDao.FindAllClientsWithoutGroup();
-        if (groupLessClients != null) {
-          foreach (ClientDto currClient in groupLessClients) {
-            emptyClientGroup.Resources.Add(currClient);
-          }
+      ResponseList<ClientGroup> response = new ResponseList<ClientGroup>();
+
+      List<ClientGroup> allClientGroups =
+        new List<ClientGroup>(DaoLocator.ClientGroupDao.FindAllWithSubGroupsAndClients());
+      ClientGroup emptyClientGroup = new ClientGroup();
+      IEnumerable<ClientDto> groupLessClients = DaoLocator.ClientDao.FindAllClientsWithoutGroup();
+      if (groupLessClients != null) {
+        foreach (ClientDto currClient in groupLessClients) {
+          emptyClientGroup.Resources.Add(currClient);
         }
-        emptyClientGroup.Id = Guid.Empty;
-        allClientGroups.Add(emptyClientGroup);
-
-        response.List = allClientGroups;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_ALL_CLIENTGROUPS;
-        response.Success = true;
-
-        return response;
-   /*   }
-      finally {
-        if (session != null)
-          session.EndSession();
-      }*/
+      }
+      emptyClientGroup.Id = Guid.Empty;
+      allClientGroups.Add(emptyClientGroup);
+
+      response.List = allClientGroups;
+      response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_ALL_CLIENTGROUPS;
+      response.Success = true;
+
+      return response;
     }
 
@@ -121 +96 @@
     /// <returns></returns>
     public ResponseObject<ClientGroup> AddClientGroup(ClientGroup clientGroup) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      try {
-        IClientGroupAdapter clientGroupAdapter =
-          session.GetDataAdapter<ClientGroup, IClientGroupAdapter>();*/
-
-        ResponseObject<ClientGroup> response = new ResponseObject<ClientGroup>();
-
-        if (clientGroup.Id != Guid.Empty) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_ID_MUST_NOT_BE_SET;
-        } else {
-          clientGroup = DaoLocator.ClientGroupDao.Insert(clientGroup);
-          //clientGroupAdapter.Update(clientGroup);
-          response.Obj = clientGroup;
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_ADDED;
-        }
-
-        return response;
-      /*}
-      finally {
-        if (session != null)
-          session.EndSession();
-      } */
+      ResponseObject<ClientGroup> response = new ResponseObject<ClientGroup>();
+
+      if (clientGroup.Id != Guid.Empty) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_ID_MUST_NOT_BE_SET;
+      }
+      else {
+        clientGroup = DaoLocator.ClientGroupDao.Insert(clientGroup);
+        //clientGroupAdapter.Update(clientGroup);
+        response.Obj = clientGroup;
+        response.Success = true;
+        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_ADDED;
+      }
+
+      return response;
     }
 
@@ -155 +120 @@
     /// <returns></returns>
     public Response AddResourceToGroup(Guid clientGroupId, ResourceDto resource) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      try {
-        IClientGroupAdapter clientGroupAdapter =
-          session.GetDataAdapter<ClientGroup, IClientGroupAdapter>();*/
-
-        Response response = new Response();
-
-        ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
-        if (clientGroup == null) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
+      Response response = new Response();
+
+      ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
+      if (clientGroup == null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
+        return response;
+      }
+      clientGroup.Resources.Add(resource);
+      DaoLocator.ClientGroupDao.AddRessourceToClientGroup(resource.Id, clientGroup.Id);
+      //clientGroupAdapter.Update(clientGroup);
+
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_ADDED_TO_GROUP;
+
+      return response;
+    }
+
+    /// <summary>
+    /// Remove a resource from a group
+    /// </summary>
+    /// <param name="clientGroupId"></param>
+    /// <param name="resourceId"></param>
+    /// <returns></returns>
+    public Response DeleteResourceFromGroup(Guid clientGroupId, Guid resourceId) {
+      Response response = new Response();
+
+      ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
+      if (clientGroup == null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
+        return response;
+      }
+      foreach (ResourceDto resource in clientGroup.Resources) {
+        if (resource.Id == resourceId) {
+          clientGroup.Resources.Remove(resource);
+          DaoLocator.ClientGroupDao.RemoveRessourceFromClientGroup(resource.Id, clientGroup.Id);
+          //clientGroupAdapter.Update(clientGroup);
+          response.Success = true;
+          response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_REMOVED;
           return response;
         }
-        clientGroup.Resources.Add(resource);
-        DaoLocator.ClientGroupDao.AddRessourceToClientGroup(resource.Id, clientGroup.Id);          
-        //clientGroupAdapter.Update(clientGroup);
-
+      }
+      response.Success = false;
+      response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
+
+      return response;
+    }
+
+    public ResponseObject<List<ClientGroup>> GetAllGroupsOfResource(Guid resourceId) {
+      ResponseObject<List<ClientGroup>> response = new ResponseObject<List<ClientGroup>>();
+
+      ClientDto client = DaoLocator.ClientDao.FindById(resourceId);
+      if (client != null) {
+        List<ClientGroup> groupsOfClient = new List<ClientGroup>(DaoLocator.ClientGroupDao.MemberOf(client));
+        response.Obj = groupsOfClient;
         response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_ADDED_TO_GROUP;
-
+        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT;
+      }
+      else {
+        response.Obj = new List<ClientGroup>();
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
+      }
+
+      return response;
+    }
+
+    public Response DeleteClientGroup(Guid clientGroupId) {
+      Response response = new Response();
+
+      ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
+      if (clientGroup == null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
         return response;
       }
-      /*finally {
-        if (session != null)
-          session.EndSession();
-      } 
-    }   */
-
-    /// <summary>
-    /// Remove a resource from a group
-    /// </summary>
-    /// <param name="clientGroupId"></param>
-    /// <param name="resourceId"></param>
-    /// <returns></returns>
-    public Response DeleteResourceFromGroup(Guid clientGroupId, Guid resourceId) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      try {
-        IClientGroupAdapter clientGroupAdapter =
-          session.GetDataAdapter<ClientGroup, IClientGroupAdapter>();*/
-
-        Response response = new Response();
-
-        ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
-        if (clientGroup == null) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
-          return response;
-        }
-        foreach (ResourceDto resource in clientGroup.Resources) {
-          if (resource.Id == resourceId) {
-            clientGroup.Resources.Remove(resource);
-            DaoLocator.ClientGroupDao.RemoveRessourceFromClientGroup(resource.Id, clientGroup.Id);
-            //clientGroupAdapter.Update(clientGroup);
-            response.Success = true;
-            response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_REMOVED;
-            return response;
-          }
-        }
-        response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
-
-        return response;
-      }
-      /*finally {
-        if (session != null)
-          session.EndSession();
-      }
-    }   */
-
-    public ResponseObject<List<ClientGroup>> GetAllGroupsOfResource(Guid resourceId) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      try {
-        IClientGroupAdapter clientGroupAdapter =
-          session.GetDataAdapter<ClientGroup, IClientGroupAdapter>();
-        IClientAdapter clientAdapter =
-          session.GetDataAdapter<ClientDto, IClientAdapter>();*/
-
-        ResponseObject<List<ClientGroup>> response = new ResponseObject<List<ClientGroup>>();
-
-        ClientDto client = DaoLocator.ClientDao.FindById(resourceId);
-        if (client != null) {
-          List<ClientGroup> groupsOfClient = new List<ClientGroup>(DaoLocator.ClientGroupDao.MemberOf(client));
-          response.Obj = groupsOfClient;
-          response.Success = true;
-          response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT;
-        } else {
-          response.Obj = new List<ClientGroup>();
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
-        }
-
-        return response;
-      }
-      /*finally {
-        if (session != null)
-          session.EndSession();
-      }
-    }   */
-
-    public Response DeleteClientGroup(Guid clientGroupId) {
-      /*ISession session = factory.GetSessionForCurrentThread();
-
-      try {
-        IClientGroupAdapter clientGroupAdapter =
-          session.GetDataAdapter<ClientGroup, IClientGroupAdapter>();*/
-
-        Response response = new Response();
-
-        ClientGroup clientGroup = DaoLocator.ClientGroupDao.FindById(clientGroupId);
-        if (clientGroup == null) {
-          response.Success = false;
-          response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DOESNT_EXIST;
-          return response;
-        }
-
-        DaoLocator.ClientGroupDao.Delete(clientGroup);
-
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DELETED;
-        return response;
-
-      }/* finally {
-        if (session != null)
-          session.EndSession();
-      }
-    }    */
-
+
+      DaoLocator.ClientGroupDao.Delete(clientGroup);
+
+      response.Success = true;
+      response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_CLIENTGROUP_DELETED;
+      return response;
+    }
+
+    public ResponseList<AppointmentDto> GetUptimeCalendarForResource(Guid guid) {
+      ResponseList<AppointmentDto> response = new ResponseList<AppointmentDto>();
+      response.List = new List<AppointmentDto>(DaoLocator.UptimeCalendarDao.GetUptimeCalendarForResource(guid));
+      response.Success = true;
+      return response;
+    }
+
+    public Response SetUptimeCalendarForResource(Guid guid, IEnumerable<AppointmentDto> appointments) {
+      DaoLocator.UptimeCalendarDao.SetUptimeCalendarForResource(guid, appointments);
+      return new Response {Success = true};
+    }
     #endregion
   }

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/DaoLocator.cs

@@ -13 +13 @@
     [ThreadStatic] private static IJobDao jobDao;
     [ThreadStatic] private static IPluginInfoDao pluginInfoDao;
+    [ThreadStatic] private static IUptimeCalendarDao uptimeCalendarDao;
 
     public static IClientDao ClientDao {
@@ -54 +55 @@
     }
 
+    public static IUptimeCalendarDao UptimeCalendarDao {
+      get {
+        if (uptimeCalendarDao == null)
+          uptimeCalendarDao = new UptimeCalendarDao();
+        return uptimeCalendarDao;
+      }
+    }
+
     public static void DestroyContext() {
       if (ContextFactory.Context != null) {

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs

@@ -172 +172 @@
     }
 
+    public ResponseList<AppointmentDto> GetUptimeCalendarForResource(Guid guid) {
+      return clientManager.GetUptimeCalendarForResource(guid);
+    }
+
+    public Response SetUptimeCalendarForResource(Guid guid, IEnumerable<AppointmentDto> appointments) {
+      return clientManager.SetUptimeCalendarForResource(guid, appointments);
+    }
   }
 }

trunk/sources/HeuristicLab.Hive.Server.DataAccess/3.2/HeuristicLab.Hive.Server.DataAccess-3.2.csproj

@@ -85 +85 @@
     <Compile Include="IPluginInfoDao.cs" />
     <Compile Include="IProjectAdapter.cs" />
+    <Compile Include="IUptimeCalendarDao.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="HiveServerDataAccessPlugin.cs" />

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj

@@ -105 +105 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Compile Include="UptimeCalendarDao.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml

@@ -77 +77 @@
       <Association Name="Resource_ClientGroup_Resource" Member="ClientGroup_Resources" ThisKey="ResourceId" OtherKey="ResourceId" Type="ClientGroup_Resource" />
       <Association Name="Resource_Client" Member="Client" ThisKey="ResourceId" OtherKey="ResourceId" Type="Client" Cardinality="One" />
+      <Association Name="Resource_UptimeCalendar" Member="UptimeCalendars" ThisKey="ResourceId" OtherKey="ResourceId" Type="UptimeCalendar" />
     </Type>
   </Table>
@@ -120 +121 @@
     </Type>
   </Table>
+  <Table Name="dbo.UptimeCalendar" Member="UptimeCalendars">
+    <Type Name="UptimeCalendar">
+      <Column Name="UptimeCalendarId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
+      <Column Name="ResourceId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
+      <Column Name="StartDate" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
+      <Column Name="EndDate" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
+      <Column Name="AllDayEvent" Type="System.Boolean" DbType="Bit NOT NULL" CanBeNull="false" />
+      <Column Name="Recurring" Type="System.Boolean" DbType="Bit NOT NULL" CanBeNull="false" />
+      <Column Name="RecurringId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="false" />
+      <Association Name="Resource_UptimeCalendar" Member="Resource" ThisKey="ResourceId" OtherKey="ResourceId" Type="Resource" IsForeignKey="true" DeleteRule="CASCADE" DeleteOnNull="true" />
+    </Type>
+  </Table>
 </Database>

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.dbml.layout

@@ -71 +71 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(4.4375 : 5.75); (4.4375 : 5.1362939453125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(4.78125 : 5.75); (4.78125 : 5.1362939453125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Resource/Resource_AssignedResource" />
       <nodes>
@@ -105 +105 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(4.5 : 6.94399251302083); (4.5 : 7.625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(4.78125 : 6.94399251302083); (4.78125 : 7.625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Resource/Resource_Client" />
       <nodes>
@@ -125 +125 @@
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(10 : 6.5); (10 : 4.34375); (5.5 : 4.34375)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(10 : 6.5); (10 : 4.34375); (5.5 : 4.34375)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_AssignedResource" />
       <nodes>
@@ -132 +132 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(11 : 9.37580485026042); (12 : 9.37580485026042)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(11 : 9.37580485026042); (12 : 9.37580485026042)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Job/Job_RequiredPlugin" />
       <nodes>
@@ -139 +139 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(5.625 : 8.91270182291667); (9 : 8.91270182291667)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(5.625 : 8.91270182291667); (9 : 8.91270182291667)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Client/Client_Job" />
       <nodes>
@@ -153 +153 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(8.25 : 11.0969962565104); (9.32336288461538 : 11.0969962565104); (9.32336288461538 : 10.0016097005208)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(8.25 : 11.0969962565104); (9.32336288461538 : 11.0969962565104); (9.32336288461538 : 10.0016097005208)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/HiveDataContext/Project/Project_Job" />
       <nodes>
@@ -160 +160 @@
       </nodes>
     </associationConnector>
+    <classShape Id="9ae82b5f-6e47-4a8e-8350-f7312381bb3b" absoluteBounds="0.625, 5.125, 2, 2.1554996744791666">
+      <DataClassMoniker Name="/HiveDataContext/UptimeCalendar" />
+      <nestedChildShapes>
+        <elementListCompartment Id="7469c6a3-4cb2-41c2-82b9-6999782218dd" absoluteBounds="0.64000000000000012, 5.585, 1.9700000000000002, 1.5954996744791665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+      </nestedChildShapes>
+    </classShape>
+    <associationConnector edgePoints="[(3.375 : 6.34699625651042); (2.625 : 6.34699625651042)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+      <AssociationMoniker Name="/HiveDataContext/Resource/Resource_UptimeCalendar" />
+      <nodes>
+        <classShapeMoniker Id="e44e8355-4290-42f0-8b46-4473e91e504b" />
+        <classShapeMoniker Id="9ae82b5f-6e47-4a8e-8350-f7312381bb3b" />
+      </nodes>
+    </associationConnector>
   </nestedChildShapes>
 </ordesignerObjectsDiagram>

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/Hive.designer.cs

@@ -64 +64 @@
     partial void UpdateJob(Job instance);
     partial void DeleteJob(Job instance);
+    partial void InsertUptimeCalendar(UptimeCalendar instance);
+    partial void UpdateUptimeCalendar(UptimeCalendar instance);
+    partial void DeleteUptimeCalendar(UptimeCalendar instance);
     #endregion
     
@@ -181 +184 @@
       {
         return this.GetTable<Job>();
+      }
+    }
+    
+    public System.Data.Linq.Table<UptimeCalendar> UptimeCalendars
+    {
+      get
+      {
+        return this.GetTable<UptimeCalendar>();
       }
     }
@@ -604 +615 @@
     }
     
-    [Column(Storage="_UpDownTimeCalendar", DbType="Xml", CanBeNull=true, UpdateCheck=UpdateCheck.Never)]
+    [Column(Storage="_UpDownTimeCalendar", DbType="Xml", UpdateCheck=UpdateCheck.Never)]
     public System.Xml.Linq.XElement UpDownTimeCalendar
     {
@@ -1499 +1510 @@
     private EntityRef<Client> _Client;
     
+    private EntitySet<UptimeCalendar> _UptimeCalendars;
+    
     #region Extensibility Method Definitions
     partial void OnLoaded();
@@ -1515 +1528 @@
       this._ClientGroup_Resources = new EntitySet<ClientGroup_Resource>(new Action<ClientGroup_Resource>(this.attach_ClientGroup_Resources), new Action<ClientGroup_Resource>(this.detach_ClientGroup_Resources));
       this._Client = default(EntityRef<Client>);
+      this._UptimeCalendars = new EntitySet<UptimeCalendar>(new Action<UptimeCalendar>(this.attach_UptimeCalendars), new Action<UptimeCalendar>(this.detach_UptimeCalendars));
       OnCreated();
     }
@@ -1642 +1656 @@
     }
     
+    [Association(Name="Resource_UptimeCalendar", Storage="_UptimeCalendars", ThisKey="ResourceId", OtherKey="ResourceId")]
+    public EntitySet<UptimeCalendar> UptimeCalendars
+    {
+      get
+      {
+        return this._UptimeCalendars;
+      }
+      set
+      {
+        this._UptimeCalendars.Assign(value);
+      }
+    }
+    
     public event PropertyChangingEventHandler PropertyChanging;
     
@@ -1681 +1708 @@
     
     private void detach_ClientGroup_Resources(ClientGroup_Resource entity)
+    {
+      this.SendPropertyChanging();
+      entity.Resource = null;
+    }
+    
+    private void attach_UptimeCalendars(UptimeCalendar entity)
+    {
+      this.SendPropertyChanging();
+      entity.Resource = this;
+    }
+    
+    private void detach_UptimeCalendars(UptimeCalendar entity)
     {
       this.SendPropertyChanging();
@@ -2278 +2317 @@
     }
     
-    [Column(Storage="_SerializedJob", DbType="VarBinary(MAX)", CanBeNull=true, UpdateCheck=UpdateCheck.Never)]
+    [Column(Storage="_SerializedJob", DbType="VarBinary(MAX)", UpdateCheck=UpdateCheck.Never)]
     public System.Data.Linq.Binary SerializedJob
     {
@@ -2659 +2698 @@
     }
   }
+  
+  [Table(Name="dbo.UptimeCalendar")]
+  public partial class UptimeCalendar : INotifyPropertyChanging, INotifyPropertyChanged
+  {
+    
+    private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+    
+    private System.Guid _UptimeCalendarId;
+    
+    private System.Guid _ResourceId;
+    
+    private System.DateTime _StartDate;
+    
+    private System.DateTime _EndDate;
+    
+    private bool _AllDayEvent;
+    
+    private bool _Recurring;
+    
+    private System.Guid _RecurringId;
+    
+    private EntityRef<Resource> _Resource;
+    
+    #region Extensibility Method Definitions
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnUptimeCalendarIdChanging(System.Guid value);
+    partial void OnUptimeCalendarIdChanged();
+    partial void OnResourceIdChanging(System.Guid value);
+    partial void OnResourceIdChanged();
+    partial void OnStartDateChanging(System.DateTime value);
+    partial void OnStartDateChanged();
+    partial void OnEndDateChanging(System.DateTime value);
+    partial void OnEndDateChanged();
+    partial void OnAllDayEventChanging(bool value);
+    partial void OnAllDayEventChanged();
+    partial void OnRecurringChanging(bool value);
+    partial void OnRecurringChanged();
+    partial void OnRecurringIdChanging(System.Guid value);
+    partial void OnRecurringIdChanged();
+    #endregion
+    
+    public UptimeCalendar()
+    {
+      this._Resource = default(EntityRef<Resource>);
+      OnCreated();
+    }
+    
+    [Column(Storage="_UptimeCalendarId", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true)]
+    public System.Guid UptimeCalendarId
+    {
+      get
+      {
+        return this._UptimeCalendarId;
+      }
+      set
+      {
+        if ((this._UptimeCalendarId != value))
+        {
+          this.OnUptimeCalendarIdChanging(value);
+          this.SendPropertyChanging();
+          this._UptimeCalendarId = value;
+          this.SendPropertyChanged("UptimeCalendarId");
+          this.OnUptimeCalendarIdChanged();
+        }
+      }
+    }
+    
+    [Column(Storage="_ResourceId", DbType="UniqueIdentifier NOT NULL")]
+    public System.Guid ResourceId
+    {
+      get
+      {
+        return this._ResourceId;
+      }
+      set
+      {
+        if ((this._ResourceId != value))
+        {
+          if (this._Resource.HasLoadedOrAssignedValue)
+          {
+            throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+          }
+          this.OnResourceIdChanging(value);
+          this.SendPropertyChanging();
+          this._ResourceId = value;
+          this.SendPropertyChanged("ResourceId");
+          this.OnResourceIdChanged();
+        }
+      }
+    }
+    
+    [Column(Storage="_StartDate", DbType="DateTime NOT NULL")]
+    public System.DateTime StartDate
+    {
+      get
+      {
+        return this._StartDate;
+      }
+      set
+      {
+        if ((this._StartDate != value))
+        {
+          this.OnStartDateChanging(value);
+          this.SendPropertyChanging();
+          this._StartDate = value;
+          this.SendPropertyChanged("StartDate");
+          this.OnStartDateChanged();
+        }
+      }
+    }
+    
+    [Column(Storage="_EndDate", DbType="DateTime NOT NULL")]
+    public System.DateTime EndDate
+    {
+      get
+      {
+        return this._EndDate;
+      }
+      set
+      {
+        if ((this._EndDate != value))
+        {
+          this.OnEndDateChanging(value);
+          this.SendPropertyChanging();
+          this._EndDate = value;
+          this.SendPropertyChanged("EndDate");
+          this.OnEndDateChanged();
+        }
+      }
+    }
+    
+    [Column(Storage="_AllDayEvent", DbType="Bit NOT NULL")]
+    public bool AllDayEvent
+    {
+      get
+      {
+        return this._AllDayEvent;
+      }
+      set
+      {
+        if ((this._AllDayEvent != value))
+        {
+          this.OnAllDayEventChanging(value);
+          this.SendPropertyChanging();
+          this._AllDayEvent = value;
+          this.SendPropertyChanged("AllDayEvent");
+          this.OnAllDayEventChanged();
+        }
+      }
+    }
+    
+    [Column(Storage="_Recurring", DbType="Bit NOT NULL")]
+    public bool Recurring
+    {
+      get
+      {
+        return this._Recurring;
+      }
+      set
+      {
+        if ((this._Recurring != value))
+        {
+          this.OnRecurringChanging(value);
+          this.SendPropertyChanging();
+          this._Recurring = value;
+          this.SendPropertyChanged("Recurring");
+          this.OnRecurringChanged();
+        }
+      }
+    }
+    
+    [Column(Storage="_RecurringId", DbType="UniqueIdentifier")]
+    public System.Guid RecurringId
+    {
+      get
+      {
+        return this._RecurringId;
+      }
+      set
+      {
+        if ((this._RecurringId != value))
+        {
+          this.OnRecurringIdChanging(value);
+          this.SendPropertyChanging();
+          this._RecurringId = value;
+          this.SendPropertyChanged("RecurringId");
+          this.OnRecurringIdChanged();
+        }
+      }
+    }
+    
+    [Association(Name="Resource_UptimeCalendar", Storage="_Resource", ThisKey="ResourceId", OtherKey="ResourceId", IsForeignKey=true, DeleteOnNull=true, DeleteRule="CASCADE")]
+    public Resource Resource
+    {
+      get
+      {
+        return this._Resource.Entity;
+      }
+      set
+      {
+        Resource previousValue = this._Resource.Entity;
+        if (((previousValue != value) 
+              || (this._Resource.HasLoadedOrAssignedValue == false)))
+        {
+          this.SendPropertyChanging();
+          if ((previousValue != null))
+          {
+            this._Resource.Entity = null;
+            previousValue.UptimeCalendars.Remove(this);
+          }
+          this._Resource.Entity = value;
+          if ((value != null))
+          {
+            value.UptimeCalendars.Add(this);
+            this._ResourceId = value.ResourceId;
+          }
+          else
+          {
+            this._ResourceId = default(System.Guid);
+          }
+          this.SendPropertyChanged("Resource");
+        }
+      }
+    }
+    
+    public event PropertyChangingEventHandler PropertyChanging;
+    
+    public event PropertyChangedEventHandler PropertyChanged;
+    
+    protected virtual void SendPropertyChanging()
+    {
+      if ((this.PropertyChanging != null))
+      {
+        this.PropertyChanging(this, emptyChangingEventArgs);
+      }
+    }
+    
+    protected virtual void SendPropertyChanged(String propertyName)
+    {
+      if ((this.PropertyChanged != null))
+      {
+        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+      }
+    }
+  }
 }
 #pragma warning restore 1591