1 files changed, 205 insertions, 8 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index bb52ecb86..01cd9d1a9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -87,11 +87,14 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Converters\ByteArrayToFileSizeConverter.cs" />
+    <Compile Include="Converters\EventTypeActionsToStringConverter.cs" />
+    <Compile Include="Converters\LiquidTypeRmlsToStringConverter.cs" />
     <Compile Include="Converters\RolesPermissionsToStringConverter.cs" />
     <Compile Include="DBModule.cs" />
-    <Compile Include="ExtensionMethods\INotificationProviderExtensions.cs" />
     <Compile Include="Messages\CloseEntityEditViewMessage.cs" />
     <Compile Include="Messages\OpenEntityEditViewMessage.cs" />
+    <Compile Include="ViewModels\ActionTypesViewVM.cs" />
     <Compile Include="ViewModels\AddressesViewVM.cs" />
     <Compile Include="ViewModels\ApplicationDisplayPanelVersionsViewVM.cs" />
     <Compile Include="ViewModels\ApplicationFirmwareVersionsViewVM.cs" />
@@ -99,26 +102,110 @@
     <Compile Include="ViewModels\ApplicationVersionsViewVM.cs" />
     <Compile Include="ViewModels\CartridgesViewVM.cs" />
     <Compile Include="ViewModels\CartridgeTypesViewVM.cs" />
+    <Compile Include="ViewModels\CatsViewVM.cs" />
+    <Compile Include="ViewModels\CctsViewVM.cs" />
     <Compile Include="ViewModels\ConfigurationsViewVM.cs" />
+    <Compile Include="ViewModels\ContactsViewVM.cs" />
     <Compile Include="ViewModels\DbTableViewModel.cs" />
     <Compile Include="ViewModels\DialogOpenMode.cs" />
     <Compile Include="ViewModels\DispenserTypesViewVM.cs" />
     <Compile Include="ViewModels\DispensersViewVM.cs" />
     <Compile Include="ViewModels\EmbeddedFirmwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\EmbeddedSoftwareVersionsViewVM.cs" />
+    <Compile Include="ViewModels\EventTypesViewVM.cs" />
+    <Compile Include="ViewModels\FiberShapesViewVM.cs" />
+    <Compile Include="ViewModels\FiberSynthsViewVM.cs" />
     <Compile Include="ViewModels\HardwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\IdsPacksViewVM.cs" />
-    <Compile Include="ViewModels\LiquidsViewVM.cs" />
+    <Compile Include="ViewModels\LinearMassDensityUnitsViewVM.cs" />
+    <Compile Include="ViewModels\LiquidTypesViewVM.cs" />
     <Compile Include="ViewModels\MachinesViewVM.cs" />
     <Compile Include="ViewModels\MachineVersionsViewVM.cs" />
+    <Compile Include="ViewModels\MediaColorsViewVM.cs" />
+    <Compile Include="ViewModels\MediaConditionsViewVM.cs" />
+    <Compile Include="ViewModels\MediaMaterialsViewVM.cs" />
+    <Compile Include="ViewModels\MediaPurposesViewVM.cs" />
     <Compile Include="ViewModels\MultiComboVM.cs" />
     <Compile Include="ViewModels\OrganizationsViewVM.cs" />
     <Compile Include="ViewModels\PermissionsViewVM.cs" />
+    <Compile Include="ViewModels\RmlsViewVM.cs" />
     <Compile Include="ViewModels\RolesViewVM.cs" />
     <Compile Include="ViewModels\UsersViewVM.cs" />
     <Compile Include="ViewModels\EntityViewModel.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="ViewModelLocator.cs" />
+    <Compile Include="Views\DBViews\ActionTypesView.xaml.cs">
+      <DependentUpon>ActionTypesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ActionTypeView.xaml.cs">
+      <DependentUpon>ActionTypeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CatsView.xaml.cs">
+      <DependentUpon>CatsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CctsView.xaml.cs">
+      <DependentUpon>CctsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CatView.xaml.cs">
+      <DependentUpon>CatView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CctView.xaml.cs">
+      <DependentUpon>CctView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\RmlView.xaml.cs">
+      <DependentUpon>RmlView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\RmlsView.xaml.cs">
+      <DependentUpon>RmlsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ContactView.xaml.cs">
+      <DependentUpon>ContactView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\ContactsView.xaml.cs">
+      <DependentUpon>ContactsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaConditionsView.xaml.cs">
+      <DependentUpon>MediaConditionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaConditionView.xaml.cs">
+      <DependentUpon>MediaConditionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\LinearMassDensityUnitsView.xaml.cs">
+      <DependentUpon>LinearMassDensityUnitsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\LinearMassDensityUnitView.xaml.cs">
+      <DependentUpon>LinearMassDensityUnitView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\FiberShapesView.xaml.cs">
+      <DependentUpon>FiberShapesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\FiberShapeView.xaml.cs">
+      <DependentUpon>FiberShapeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\FiberSynthsView.xaml.cs">
+      <DependentUpon>FiberSynthsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\FiberSynthView.xaml.cs">
+      <DependentUpon>FiberSynthView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaPurposesView.xaml.cs">
+      <DependentUpon>MediaPurposesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaMaterialsView.xaml.cs">
+      <DependentUpon>MediaMaterialsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaColorView.xaml.cs">
+      <DependentUpon>MediaColorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaPurposView.xaml.cs">
+      <DependentUpon>MediaPurposView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaMaterialView.xaml.cs">
+      <DependentUpon>MediaMaterialView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\MediaColorsView.xaml.cs">
+      <DependentUpon>MediaColorsView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DBViews\IdsPacksView.xaml.cs">
       <DependentUpon>IdsPacksView.xaml</DependentUpon>
     </Compile>
@@ -149,11 +236,11 @@
     <Compile Include="Views\DBViews\IdsPackView.xaml.cs">
       <DependentUpon>IdsPackView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\LiquidView.xaml.cs">
-      <DependentUpon>LiquidView.xaml</DependentUpon>
+    <Compile Include="Views\DBViews\LiquidTypeView.xaml.cs">
+      <DependentUpon>LiquidTypeView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\LiquidsView.xaml.cs">
-      <DependentUpon>LiquidsView.xaml</DependentUpon>
+    <Compile Include="Views\DBViews\LiquidTypesView.xaml.cs">
+      <DependentUpon>LiquidTypesView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\DBViews\HardwareVersionView.xaml.cs">
       <DependentUpon>HardwareVersionView.xaml</DependentUpon>
@@ -239,9 +326,15 @@
     <Compile Include="Views\DBViews\OrganizationView.xaml.cs">
       <DependentUpon>OrganizationView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DBViews\EventTypesView.xaml.cs">
+      <DependentUpon>EventTypesView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DBViews\UsersView.xaml.cs">
       <DependentUpon>UsersView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DBViews\EventTypeView.xaml.cs">
+      <DependentUpon>EventTypeView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DBViews\UserView.xaml.cs">
       <DependentUpon>UserView.xaml</DependentUpon>
     </Compile>
@@ -266,6 +359,102 @@
     <Compile Include="CustomAttributes\DBViewAttribute.cs" />
     <Compile Include="Managers\RegisteredView.cs" />
     <Compile Include="Managers\ViewsManager.cs" />
+    <Page Include="Views\DBViews\ActionTypesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ActionTypeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CatsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CctsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CatView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CctView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\RmlView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\RmlsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ContactView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\ContactsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaConditionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaConditionView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\LinearMassDensityUnitsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\LinearMassDensityUnitView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\FiberShapesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\FiberShapeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\FiberSynthsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\FiberSynthView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaPurposesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaMaterialsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaColorView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaPurposView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaMaterialView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\MediaColorsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\DBViews\IdsPacksView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -306,11 +495,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\LiquidView.xaml">
+    <Page Include="Views\DBViews\LiquidTypeView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\LiquidsView.xaml">
+    <Page Include="Views\DBViews\LiquidTypesView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -426,10 +615,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\DBViews\EventTypesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\DBViews\UsersView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\DBViews\EventTypeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\DBViews\UserView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>