diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2017-12-19 14:53:03 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2017-12-19 14:53:03 +0200 |
| commit | fee2c690e1ff0b8be3a3f10e30184c76efa4c0c2 (patch) | |
| tree | 670fb9b3f84d5a4b0af1c6c7797a6f130b68e38d | |
| parent | b421701fd5cf000a16cab9b1fe9eda812ccce8c3 (diff) | |
| download | Tango-fee2c690e1ff0b8be3a3f10e30184c76efa4c0c2.tar.gz Tango-fee2c690e1ff0b8be3a3f10e30184c76efa4c0c2.zip | |
Modified several table names.
65 files changed, 834 insertions, 710 deletions
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java index e02fc0b3f..e60d6e134 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java @@ -1,7 +1,7 @@ package com.twine.tango.dal.dao; import com.raizlabs.android.dbflow.sql.language.SQLite; -import com.twine.tango.dal.entities.Action; +import com.twine.tango.dal.entities.ActionType; import com.twine.tango.dal.entities.Address; import com.twine.tango.dal.entities.ApplicationDisplayPanelVersion; import com.twine.tango.dal.entities.ApplicationFirmwareVersion; @@ -15,15 +15,15 @@ import com.twine.tango.dal.entities.DispenserType; import com.twine.tango.dal.entities.Dispenser; import com.twine.tango.dal.entities.EmbeddedFirmwareVersion; import com.twine.tango.dal.entities.EmbeddedSoftwareVersion; -import com.twine.tango.dal.entities.Event; -import com.twine.tango.dal.entities.EventsAction; +import com.twine.tango.dal.entities.EventType; +import com.twine.tango.dal.entities.EventTypesAction; import com.twine.tango.dal.entities.FiberShape; import com.twine.tango.dal.entities.FiberSynth; import com.twine.tango.dal.entities.HardwareVersion; import com.twine.tango.dal.entities.IdsPack; import com.twine.tango.dal.entities.LinearMassDensityUnit; -import com.twine.tango.dal.entities.Liquid; -import com.twine.tango.dal.entities.LiquidsRml; +import com.twine.tango.dal.entities.LiquidType; +import com.twine.tango.dal.entities.LiquidTypesRml; import com.twine.tango.dal.entities.MachineVersion; import com.twine.tango.dal.entities.Machine; import com.twine.tango.dal.entities.MachinesConfiguration; @@ -46,13 +46,13 @@ public class TangoDAO { /** - * Gets all the Actions from database. + * Gets all the ActionTypes from database. * - * @return all Actions + * @return all ActionTypes */ - public static List<Action> getAllActions() + public static List<ActionType> getAllActionTypes() { - return SQLite.select().from(Action.class).queryList(); + return SQLite.select().from(ActionType.class).queryList(); } /** @@ -186,23 +186,23 @@ public class TangoDAO } /** - * Gets all the Events from database. + * Gets all the EventTypes from database. * - * @return all Events + * @return all EventTypes */ - public static List<Event> getAllEvents() + public static List<EventType> getAllEventTypes() { - return SQLite.select().from(Event.class).queryList(); + return SQLite.select().from(EventType.class).queryList(); } /** - * Gets all the EventsActions from database. + * Gets all the EventTypesActions from database. * - * @return all EventsActions + * @return all EventTypesActions */ - public static List<EventsAction> getAllEventsActions() + public static List<EventTypesAction> getAllEventTypesActions() { - return SQLite.select().from(EventsAction.class).queryList(); + return SQLite.select().from(EventTypesAction.class).queryList(); } /** @@ -256,23 +256,23 @@ public class TangoDAO } /** - * Gets all the Liquids from database. + * Gets all the LiquidTypes from database. * - * @return all Liquids + * @return all LiquidTypes */ - public static List<Liquid> getAllLiquids() + public static List<LiquidType> getAllLiquidTypes() { - return SQLite.select().from(Liquid.class).queryList(); + return SQLite.select().from(LiquidType.class).queryList(); } /** - * Gets all the LiquidsRmls from database. + * Gets all the LiquidTypesRmls from database. * - * @return all LiquidsRmls + * @return all LiquidTypesRmls */ - public static List<LiquidsRml> getAllLiquidsRmls() + public static List<LiquidTypesRml> getAllLiquidTypesRmls() { - return SQLite.select().from(LiquidsRml.class).queryList(); + return SQLite.select().from(LiquidTypesRml.class).queryList(); } /** diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Event.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java index e6c5b562b..adf82e056 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Event.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java @@ -9,8 +9,8 @@ import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; - @Table(name = "EVENTS", database = TangoDB.class) - public class Event extends Entity + @Table(name = "ACTION_TYPES", database = TangoDB.class) + public class ActionType extends Entity { @Column(name = "CODE") diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Action.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java index ac0cb892f..9340b78c3 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Action.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java @@ -9,8 +9,8 @@ import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; - @Table(name = "ACTIONS", database = TangoDB.class) - public class Action extends Entity + @Table(name = "EVENT_TYPES", database = TangoDB.class) + public class EventType extends Entity { @Column(name = "CODE") diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java new file mode 100644 index 000000000..9f69b2592 --- /dev/null +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java @@ -0,0 +1,68 @@ +package com.twine.tango.dal.entities; + +import com.raizlabs.android.dbflow.annotation.Column; +import com.raizlabs.android.dbflow.annotation.ForeignKey; +import com.raizlabs.android.dbflow.annotation.ForeignKeyReference; +import com.raizlabs.android.dbflow.annotation.Table; +import org.joda.time.DateTime; +import com.twine.tango.dal.Entity; +import com.twine.tango.dal.TangoDB; + + + @Table(name = "EVENT_TYPES_ACTIONS", database = TangoDB.class) + public class EventTypesAction extends Entity + { + + @ForeignKey(references = { @ForeignKeyReference(columnName = "ACTION_TYPE_GUID", foreignKeyColumnName = "GUID")}) + private ActionType actionType; + + + + @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPE_GUID", foreignKeyColumnName = "GUID")}) + private EventType eventType; + + + + + /** + * Gets the ActionType. + * + * return the ActionType + */ + public ActionType getActionType() + { + return actionType; + } + + /** + * Sets the ActionType. + * + * @param actionType the ActionType + */ + public void setActionType(ActionType actionType) + { + this.actionType = actionType; + } + + + /** + * Gets the EventType. + * + * return the EventType + */ + public EventType getEventType() + { + return eventType; + } + + /** + * Sets the EventType. + * + * @param eventType the EventType + */ + public void setEventType(EventType eventType) + { + this.eventType = eventType; + } + + } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventsAction.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventsAction.java deleted file mode 100644 index 6019137ce..000000000 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventsAction.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.twine.tango.dal.entities; - -import com.raizlabs.android.dbflow.annotation.Column; -import com.raizlabs.android.dbflow.annotation.ForeignKey; -import com.raizlabs.android.dbflow.annotation.ForeignKeyReference; -import com.raizlabs.android.dbflow.annotation.Table; -import org.joda.time.DateTime; -import com.twine.tango.dal.Entity; -import com.twine.tango.dal.TangoDB; - - - @Table(name = "EVENTS_ACTIONS", database = TangoDB.class) - public class EventsAction extends Entity - { - - @ForeignKey(references = { @ForeignKeyReference(columnName = "ACTION_GUID", foreignKeyColumnName = "GUID")}) - private Action action; - - - - @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_GUID", foreignKeyColumnName = "GUID")}) - private Event event; - - - - - /** - * Gets the Action. - * - * return the Action - */ - public Action getAction() - { - return action; - } - - /** - * Sets the Action. - * - * @param action the Action - */ - public void setAction(Action action) - { - this.action = action; - } - - - /** - * Gets the Event. - * - * return the Event - */ - public Event getEvent() - { - return event; - } - - /** - * Sets the Event. - * - * @param event the Event - */ - public void setEvent(Event event) - { - this.event = event; - } - - } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java index 0bdabfc83..3fb61d0a1 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java @@ -33,8 +33,8 @@ import com.twine.tango.dal.TangoDB; - @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_GUID", foreignKeyColumnName = "GUID")}) - private Liquid liquid; + @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")}) + private LiquidType liquidType; @@ -124,23 +124,23 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the Liquid. + * Gets the LiquidType. * - * return the Liquid + * return the LiquidType */ - public Liquid getLiquid() + public LiquidType getLiquidType() { - return liquid; + return liquidType; } /** - * Sets the Liquid. + * Sets the LiquidType. * - * @param liquid the Liquid + * @param liquidType the LiquidType */ - public void setLiquid(Liquid liquid) + public void setLiquidType(LiquidType liquidType) { - this.liquid = liquid; + this.liquidType = liquidType; } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Liquid.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java index 6d43161f7..92461e3ed 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Liquid.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java @@ -9,8 +9,8 @@ import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; - @Table(name = "LIQUIDS", database = TangoDB.class) - public class Liquid extends Entity + @Table(name = "LIQUID_TYPES", database = TangoDB.class) + public class LiquidType extends Entity { @Column(name = "CODE") diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidsRml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java index ea79f4741..db5f43933 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidsRml.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java @@ -9,12 +9,12 @@ import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; - @Table(name = "LIQUIDS_RMLS", database = TangoDB.class) - public class LiquidsRml extends Entity + @Table(name = "LIQUID_TYPES_RMLS", database = TangoDB.class) + public class LiquidTypesRml extends Entity { - @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_GUID", foreignKeyColumnName = "GUID")}) - private Liquid liquid; + @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")}) + private LiquidType liquidType; @@ -25,23 +25,23 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the Liquid. + * Gets the LiquidType. * - * return the Liquid + * return the LiquidType */ - public Liquid getLiquid() + public LiquidType getLiquidType() { - return liquid; + return liquidType; } /** - * Sets the Liquid. + * Sets the LiquidType. * - * @param liquid the Liquid + * @param liquidType the LiquidType */ - public void setLiquid(Liquid liquid) + public void setLiquidType(LiquidType liquidType) { - this.liquid = liquid; + this.liquidType = liquidType; } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java index d91a1d4cf..778974f2c 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java @@ -28,6 +28,11 @@ import com.twine.tango.dal.TangoDB; + @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")}) + private Configuration configuration; + + + @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_VERSION_GUID", foreignKeyColumnName = "GUID")}) private MachineVersion machineVersion; @@ -103,6 +108,27 @@ import com.twine.tango.dal.TangoDB; /** + * Gets the Configuration. + * + * return the Configuration + */ + public Configuration getConfiguration() + { + return configuration; + } + + /** + * Sets the Configuration. + * + * @param configuration the Configuration + */ + public void setConfiguration(Configuration configuration) + { + this.configuration = configuration; + } + + + /** * Gets the MachineVersion. * * return the MachineVersion diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java index 15b55c35c..85cde559a 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java @@ -23,8 +23,8 @@ import com.twine.tango.dal.TangoDB; - @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_GUID", foreignKeyColumnName = "GUID")}) - private Event event; + @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPE_GUID", foreignKeyColumnName = "GUID")}) + private EventType eventType; @@ -82,23 +82,23 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the Event. + * Gets the EventType. * - * return the Event + * return the EventType */ - public Event getEvent() + public EventType getEventType() { - return event; + return eventType; } /** - * Sets the Event. + * Sets the EventType. * - * @param event the Event + * @param eventType the EventType */ - public void setEvent(Event event) + public void setEventType(EventType eventType) { - this.event = event; + this.eventType = eventType; } diff --git a/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb b/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb Binary files differindex 277930e15..2a238547c 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb +++ b/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb diff --git a/Software/DB/Tango.db b/Software/DB/Tango.db Binary files differindex 277930e15..2a238547c 100644 --- a/Software/DB/Tango.db +++ b/Software/DB/Tango.db diff --git a/Software/DB/Tango.db-journal b/Software/DB/Tango.db-journal Binary files differdeleted file mode 100644 index 1b843ca54..000000000 --- a/Software/DB/Tango.db-journal +++ /dev/null diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex ad5a04b7d..b9d42ecc7 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex 0a2572d72..a9811dfa7 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf 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..62503d47e 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 @@ -92,6 +92,7 @@ <Compile Include="ExtensionMethods\INotificationProviderExtensions.cs" /> <Compile Include="Messages\CloseEntityEditViewMessage.cs" /> <Compile Include="Messages\OpenEntityEditViewMessage.cs" /> + <Compile Include="ViewModels\ActionsTypesViewVM.cs" /> <Compile Include="ViewModels\AddressesViewVM.cs" /> <Compile Include="ViewModels\ApplicationDisplayPanelVersionsViewVM.cs" /> <Compile Include="ViewModels\ApplicationFirmwareVersionsViewVM.cs" /> @@ -106,9 +107,10 @@ <Compile Include="ViewModels\DispensersViewVM.cs" /> <Compile Include="ViewModels\EmbeddedFirmwareVersionsViewVM.cs" /> <Compile Include="ViewModels\EmbeddedSoftwareVersionsViewVM.cs" /> + <Compile Include="ViewModels\EventTypesViewVM.cs" /> <Compile Include="ViewModels\HardwareVersionsViewVM.cs" /> <Compile Include="ViewModels\IdsPacksViewVM.cs" /> - <Compile Include="ViewModels\LiquidsViewVM.cs" /> + <Compile Include="ViewModels\LiquidTypesViewVM.cs" /> <Compile Include="ViewModels\MachinesViewVM.cs" /> <Compile Include="ViewModels\MachineVersionsViewVM.cs" /> <Compile Include="ViewModels\MultiComboVM.cs" /> @@ -149,11 +151,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> @@ -306,11 +308,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> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs index 48175ed17..e8a84f1b2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs @@ -38,7 +38,7 @@ namespace Tango.MachineStudio.DB SimpleIoc.Default.Register<IdsPacksViewVM>(); SimpleIoc.Default.Register<DispensersViewVM>(); SimpleIoc.Default.Register<DispenserTypesViewVM>(); - SimpleIoc.Default.Register<LiquidsViewVM>(); + SimpleIoc.Default.Register<LiquidTypesViewVM>(); SimpleIoc.Default.Register<CartridgesViewVM>(); SimpleIoc.Default.Register<CartridgeTypesViewVM>(); } @@ -195,11 +195,11 @@ namespace Tango.MachineStudio.DB } } - public static LiquidsViewVM LiquidsViewVM + public static LiquidTypesViewVM LiquidTypesViewVM { get { - return ServiceLocator.Current.GetInstance<LiquidsViewVM>(); + return ServiceLocator.Current.GetInstance<LiquidTypesViewVM>(); } } @@ -218,5 +218,13 @@ namespace Tango.MachineStudio.DB return ServiceLocator.Current.GetInstance<CartridgeTypesViewVM>(); } } + + public static EventTypesViewVM EventTypesViewVM + { + get + { + return ServiceLocator.Current.GetInstance<EventTypesViewVM>(); + } + } } }
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionsTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionsTypesViewVM.cs new file mode 100644 index 000000000..c627ffbc4 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionsTypesViewVM.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.DAL.Observables; +using Tango.MachineStudio.Common.Notifications; + +namespace Tango.MachineStudio.DB.ViewModels +{ + public class ActionsTypesViewVM : DbTableViewModel<ActionType> + { + public ActionsTypesViewVM(INotificationProvider notification) : base(notification) + { + + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs index e57f6606e..442eac908 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs @@ -8,9 +8,9 @@ using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels { - public class LiquidsViewVM : DbTableViewModel<Liquid> + public class EventTypesViewVM : DbTableViewModel<EventType> { - public LiquidsViewVM(INotificationProvider notification) : base(notification) + public EventTypesViewVM(INotificationProvider notification) : base(notification) { } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs new file mode 100644 index 000000000..2ec2d59bb --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.DAL.Observables; +using Tango.MachineStudio.Common.Notifications; + +namespace Tango.MachineStudio.DB.ViewModels +{ + public class LiquidTypesViewVM : DbTableViewModel<LiquidType> + { + public LiquidTypesViewVM(INotificationProvider notification) : base(notification) + { + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml index 308a549fa..be6b135ce 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml @@ -36,8 +36,8 @@ </DataTemplate> </ComboBox.ItemTemplate> </ComboBox> - <TextBlock Text="Liquid:" FontWeight="Bold"></TextBlock> - <ComboBox ItemsSource="{Binding Adapter.Liquids}" SelectedItem="{Binding EditEntity.Liquid,Mode=TwoWay}"> + <TextBlock Text="Liquid Type:" FontWeight="Bold"></TextBlock> + <ComboBox ItemsSource="{Binding Adapter.LiquidTypes}" SelectedItem="{Binding EditEntity.LiquidTypes,Mode=TwoWay}"> <ComboBox.ItemTemplate> <DataTemplate> <StackPanel Orientation="Horizontal"> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml index df1557ec3..7720a07ae 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml @@ -29,16 +29,16 @@ </DataTemplate> </DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn> - <DataGridTemplateColumn Header="Liquid"> + <DataGridTemplateColumn Header="Liquid Type"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> <StackPanel Orientation="Horizontal"> <Rectangle Width="16" Height="16" VerticalAlignment="Center"> <Rectangle.Fill> - <SolidColorBrush Color="{Binding Liquid.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush> + <SolidColorBrush Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush> </Rectangle.Fill> </Rectangle> - <TextBlock Margin="5 0 0 0" Text="{Binding Liquid.Name}" VerticalAlignment="Center"></TextBlock> + <TextBlock Margin="5 0 0 0" Text="{Binding LiquidTypes.Name}" VerticalAlignment="Center"></TextBlock> </StackPanel> </DataTemplate> </DataGridTemplateColumn.CellTemplate> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml index 19bcc2674..3a14b27df 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml @@ -1,4 +1,4 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.LiquidView" +<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.LiquidTypeView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" @@ -10,7 +10,7 @@ xmlns:vm="clr-namespace:Tango.MachineStudio.DB.ViewModels" xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews" mc:Ignorable="d" - d:DesignHeight="400" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=vm:LiquidsViewVM, IsDesignTimeCreatable=False}"> + d:DesignHeight="400" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=vm:LiquidTypesViewVM, IsDesignTimeCreatable=False}"> <UserControl.Resources> <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml.cs index 653def003..f82defb24 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml.cs @@ -18,9 +18,9 @@ namespace Tango.MachineStudio.DB.Views.DBViews /// <summary> /// Interaction logic for MachineView.xaml /// </summary> - public partial class LiquidView : UserControl + public partial class LiquidTypeView : UserControl { - public LiquidView() + public LiquidTypeView() { InitializeComponent(); } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml index 749b0ccd7..4e1fe4279 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml @@ -1,4 +1,4 @@ -<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.LiquidsView" +<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.LiquidTypesView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" @@ -8,7 +8,7 @@ xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.LiquidsViewVM}"> + d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.LiquidTypesViewVM}"> <UserControl.Resources> <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter> @@ -16,7 +16,7 @@ <Grid> <controls:DbTableView> - <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.LiquidsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True"> + <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.LiquidTypesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True"> <DataGrid.Columns> <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn> <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml.cs index 2d68d5ef5..2bdb8ec67 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidsView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml.cs @@ -22,9 +22,9 @@ namespace Tango.MachineStudio.DB.Views.DBViews /// Interaction logic for MachinesView.xaml /// </summary> [DBView] - public partial class LiquidsView : UserControl + public partial class LiquidTypesView : UserControl { - public LiquidsView() : base() + public LiquidTypesView() : base() { InitializeComponent(); } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs index 6bc2a9274..a0297f529 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs @@ -12,7 +12,7 @@ namespace Tango.DAL.Local.DB using System; using System.Collections.Generic; - public partial class ACTION + public partial class ACTION_TYPES { public long ID { get; set; } public string GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs index 636c9d31a..3ec964cb8 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs @@ -12,7 +12,7 @@ namespace Tango.DAL.Local.DB using System; using System.Collections.Generic; - public partial class EVENT + public partial class EVENT_TYPES { public long ID { get; set; } public string GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENTS_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs index 3c1c30eec..0e7ba0913 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENTS_ACTIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs @@ -12,13 +12,13 @@ namespace Tango.DAL.Local.DB using System; using System.Collections.Generic; - public partial class EVENTS_ACTIONS + public partial class EVENT_TYPES_ACTIONS { public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } public bool DELETED { get; set; } - public string EVENT_GUID { get; set; } - public string ACTION_GUID { get; set; } + public string EVENT_TYPE_GUID { get; set; } + public string ACTION_TYPE_GUID { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs index f97fed77c..cb94d5f67 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs @@ -20,7 +20,7 @@ namespace Tango.DAL.Local.DB public bool DELETED { get; set; } public string CONFIGURATION_GUID { get; set; } public string DISPENSER_GUID { get; set; } - public string LIQUID_GUID { get; set; } + public string LIQUID_TYPE_GUID { get; set; } public string CARTRIDGE_GUID { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs index 9c70544ca..652d219ba 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs @@ -12,7 +12,7 @@ namespace Tango.DAL.Local.DB using System; using System.Collections.Generic; - public partial class LIQUID + public partial class LIQUID_TYPES { public long ID { get; set; } public string GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUIDS_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs index 9d613062c..cd8865526 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUIDS_RMLS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs @@ -12,13 +12,13 @@ namespace Tango.DAL.Local.DB using System; using System.Collections.Generic; - public partial class LIQUIDS_RMLS + public partial class LIQUID_TYPES_RMLS { public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } public bool DELETED { get; set; } - public string LIQUID_GUID { get; set; } + public string LIQUID_TYPE_GUID { get; set; } public string RML_GUID { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs index 38ae0a849..10f77068c 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs @@ -25,7 +25,7 @@ namespace Tango.DAL.Local.DB throw new UnintentionalCodeFirstException(); } - public virtual DbSet<ACTION> ACTIONS { get; set; } + public virtual DbSet<ACTION_TYPES> ACTION_TYPES { get; set; } public virtual DbSet<ADDRESS> ADDRESSES { get; set; } public virtual DbSet<APPLICATION_DISPLAY_PANEL_VERSIONS> APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; } public virtual DbSet<APPLICATION_FIRMWARE_VERSIONS> APPLICATION_FIRMWARE_VERSIONS { get; set; } @@ -39,15 +39,15 @@ namespace Tango.DAL.Local.DB public virtual DbSet<DISPENSER> DISPENSERS { get; set; } public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; } public virtual DbSet<EMBEDDED_SOFTWARE_VERSIONS> EMBEDDED_SOFTWARE_VERSIONS { get; set; } - public virtual DbSet<EVENT> EVENTS { get; set; } - public virtual DbSet<EVENTS_ACTIONS> EVENTS_ACTIONS { get; set; } + public virtual DbSet<EVENT_TYPES> EVENT_TYPES { get; set; } + public virtual DbSet<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; } public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; } public virtual DbSet<FIBER_SYNTHESISES> FIBER_SYNTHESISES { get; set; } public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; } public virtual DbSet<IDS_PACKS> IDS_PACKS { get; set; } public virtual DbSet<LINEAR_MASS_DENSITY_UNITS> LINEAR_MASS_DENSITY_UNITS { get; set; } - public virtual DbSet<LIQUID> LIQUIDS { get; set; } - public virtual DbSet<LIQUIDS_RMLS> LIQUIDS_RMLS { get; set; } + public virtual DbSet<LIQUID_TYPES> LIQUID_TYPES { get; set; } + public virtual DbSet<LIQUID_TYPES_RMLS> LIQUID_TYPES_RMLS { get; set; } public virtual DbSet<MACHINE_VERSIONS> MACHINE_VERSIONS { get; set; } public virtual DbSet<MACHINE> MACHINES { get; set; } public virtual DbSet<MACHINES_CONFIGURATIONS> MACHINES_CONFIGURATIONS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx index bd71d7457..261cec120 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx @@ -5,7 +5,7 @@ <!-- SSDL content --> <edmx:StorageModels> <Schema Namespace="LocalModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="Data Source=D:\Development\Tango\Software\DB\Tango.db" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl"> - <EntityType Name="ACTIONS"> + <EntityType Name="ACTION_TYPES"> <Key> <PropertyRef Name="ID" /> </Key> @@ -158,7 +158,7 @@ <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> </EntityType> - <EntityType Name="EVENTS"> + <EntityType Name="EVENT_TYPES"> <Key> <PropertyRef Name="ID" /> </Key> @@ -169,7 +169,7 @@ <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> </EntityType> - <EntityType Name="EVENTS_ACTIONS"> + <EntityType Name="EVENT_TYPES_ACTIONS"> <Key> <PropertyRef Name="ID" /> </Key> @@ -177,8 +177,8 @@ <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> - <Property Name="EVENT_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> - <Property Name="ACTION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> + <Property Name="EVENT_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> + <Property Name="ACTION_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> </EntityType> <EntityType Name="FIBER_SHAPES"> <Key> @@ -217,7 +217,7 @@ <Property Name="DELETED" Type="bit" Nullable="false" /> <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="DISPENSER_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> - <Property Name="LIQUID_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> + <Property Name="LIQUID_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="CARTRIDGE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> </EntityType> <EntityType Name="LINEAR_MASS_DENSITY_UNITS"> @@ -229,7 +229,7 @@ <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> </EntityType> - <EntityType Name="LIQUIDS"> + <EntityType Name="LIQUID_TYPES"> <Key> <PropertyRef Name="ID" /> </Key> @@ -241,7 +241,7 @@ <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="VERSION" Type="real" Nullable="false" /> </EntityType> - <EntityType Name="LIQUIDS_RMLS"> + <EntityType Name="LIQUID_TYPES_RMLS"> <Key> <PropertyRef Name="ID" /> </Key> @@ -249,7 +249,7 @@ <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> - <Property Name="LIQUID_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> + <Property Name="LIQUID_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="RML_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> </EntityType> <EntityType Name="MACHINE_VERSIONS"> @@ -275,6 +275,7 @@ <Property Name="PRODUCTION_DATE" Type="datetime" Nullable="false" /> <Property Name="ORGANIZATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="MACHINE_VERSION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> + <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> </EntityType> <EntityType Name="MACHINES_CONFIGURATIONS"> <Key> @@ -296,7 +297,7 @@ <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> <Property Name="MACHINE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> - <Property Name="EVENT_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> + <Property Name="EVENT_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="USER_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="DATE_TIME" Type="datetime" Nullable="false" /> <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> @@ -446,7 +447,7 @@ <Property Name="ROLE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> </EntityType> <EntityContainer Name="LocalModelStoreContainer"> - <EntitySet Name="ACTIONS" EntityType="Self.ACTIONS" store:Type="Tables" /> + <EntitySet Name="ACTION_TYPES" EntityType="Self.ACTION_TYPES" store:Type="Tables" /> <EntitySet Name="ADDRESSES" EntityType="Self.ADDRESSES" store:Type="Tables" /> <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" store:Type="Tables" /> <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="Self.APPLICATION_FIRMWARE_VERSIONS" store:Type="Tables" /> @@ -460,15 +461,15 @@ <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSERS" store:Type="Tables" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" store:Type="Tables" /> <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="Self.EMBEDDED_SOFTWARE_VERSIONS" store:Type="Tables" /> - <EntitySet Name="EVENTS" EntityType="Self.EVENTS" store:Type="Tables" /> - <EntitySet Name="EVENTS_ACTIONS" EntityType="Self.EVENTS_ACTIONS" store:Type="Tables" /> + <EntitySet Name="EVENT_TYPES" EntityType="Self.EVENT_TYPES" store:Type="Tables" /> + <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="Self.EVENT_TYPES_ACTIONS" store:Type="Tables" /> <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" store:Type="Tables" /> <EntitySet Name="FIBER_SYNTHESISES" EntityType="Self.FIBER_SYNTHESISES" store:Type="Tables" /> <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" store:Type="Tables" /> <EntitySet Name="IDS_PACKS" EntityType="Self.IDS_PACKS" store:Type="Tables" /> <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="Self.LINEAR_MASS_DENSITY_UNITS" store:Type="Tables" /> - <EntitySet Name="LIQUIDS" EntityType="Self.LIQUIDS" store:Type="Tables" /> - <EntitySet Name="LIQUIDS_RMLS" EntityType="Self.LIQUIDS_RMLS" store:Type="Tables" /> + <EntitySet Name="LIQUID_TYPES" EntityType="Self.LIQUID_TYPES" store:Type="Tables" /> + <EntitySet Name="LIQUID_TYPES_RMLS" EntityType="Self.LIQUID_TYPES_RMLS" store:Type="Tables" /> <EntitySet Name="MACHINE_VERSIONS" EntityType="Self.MACHINE_VERSIONS" store:Type="Tables" /> <EntitySet Name="MACHINES" EntityType="Self.MACHINES" store:Type="Tables" /> <EntitySet Name="MACHINES_CONFIGURATIONS" EntityType="Self.MACHINES_CONFIGURATIONS" store:Type="Tables" /> @@ -491,7 +492,7 @@ <edmx:ConceptualModels> <Schema Namespace="LocalModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm"> <EntityContainer Name="LocalDB" annotation:LazyLoadingEnabled="true"> - <EntitySet Name="ACTIONS" EntityType="LocalModel.ACTION" /> + <EntitySet Name="ACTION_TYPES" EntityType="LocalModel.ACTION_TYPES" /> <EntitySet Name="ADDRESSES" EntityType="LocalModel.ADDRESS" /> <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="LocalModel.APPLICATION_DISPLAY_PANEL_VERSIONS" /> <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="LocalModel.APPLICATION_FIRMWARE_VERSIONS" /> @@ -505,15 +506,15 @@ <EntitySet Name="DISPENSERS" EntityType="LocalModel.DISPENSER" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" /> <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" /> - <EntitySet Name="EVENTS" EntityType="LocalModel.EVENT" /> - <EntitySet Name="EVENTS_ACTIONS" EntityType="LocalModel.EVENTS_ACTIONS" /> + <EntitySet Name="EVENT_TYPES" EntityType="LocalModel.EVENT_TYPES" /> + <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="LocalModel.EVENT_TYPES_ACTIONS" /> <EntitySet Name="FIBER_SHAPES" EntityType="LocalModel.FIBER_SHAPES" /> <EntitySet Name="FIBER_SYNTHESISES" EntityType="LocalModel.FIBER_SYNTHESISES" /> <EntitySet Name="HARDWARE_VERSIONS" EntityType="LocalModel.HARDWARE_VERSIONS" /> <EntitySet Name="IDS_PACKS" EntityType="LocalModel.IDS_PACKS" /> <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" /> - <EntitySet Name="LIQUIDS" EntityType="LocalModel.LIQUID" /> - <EntitySet Name="LIQUIDS_RMLS" EntityType="LocalModel.LIQUIDS_RMLS" /> + <EntitySet Name="LIQUID_TYPES" EntityType="LocalModel.LIQUID_TYPES" /> + <EntitySet Name="LIQUID_TYPES_RMLS" EntityType="LocalModel.LIQUID_TYPES_RMLS" /> <EntitySet Name="MACHINE_VERSIONS" EntityType="LocalModel.MACHINE_VERSIONS" /> <EntitySet Name="MACHINES" EntityType="LocalModel.MACHINE" /> <EntitySet Name="MACHINES_CONFIGURATIONS" EntityType="LocalModel.MACHINES_CONFIGURATIONS" /> @@ -531,7 +532,7 @@ <EntitySet Name="USERS" EntityType="LocalModel.USER" /> <EntitySet Name="USERS_ROLES" EntityType="LocalModel.USERS_ROLES" /> </EntityContainer> - <EntityType Name="ACTION"> + <EntityType Name="ACTION_TYPES"> <Key> <PropertyRef Name="ID" /> </Key> @@ -684,7 +685,7 @@ <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> </EntityType> - <EntityType Name="EVENT"> + <EntityType Name="EVENT_TYPES"> <Key> <PropertyRef Name="ID" /> </Key> @@ -695,7 +696,7 @@ <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> </EntityType> - <EntityType Name="EVENTS_ACTIONS"> + <EntityType Name="EVENT_TYPES_ACTIONS"> <Key> <PropertyRef Name="ID" /> </Key> @@ -703,8 +704,8 @@ <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> - <Property Name="EVENT_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> - <Property Name="ACTION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> + <Property Name="EVENT_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> + <Property Name="ACTION_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> </EntityType> <EntityType Name="FIBER_SHAPES"> <Key> @@ -743,7 +744,7 @@ <Property Name="DELETED" Type="Boolean" Nullable="false" /> <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> - <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> + <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="CARTRIDGE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> </EntityType> <EntityType Name="LINEAR_MASS_DENSITY_UNITS"> @@ -755,7 +756,7 @@ <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> </EntityType> - <EntityType Name="LIQUID"> + <EntityType Name="LIQUID_TYPES"> <Key> <PropertyRef Name="ID" /> </Key> @@ -767,7 +768,7 @@ <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="VERSION" Type="Double" Nullable="false" /> </EntityType> - <EntityType Name="LIQUIDS_RMLS"> + <EntityType Name="LIQUID_TYPES_RMLS"> <Key> <PropertyRef Name="ID" /> </Key> @@ -775,7 +776,7 @@ <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> - <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> + <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> </EntityType> <EntityType Name="MACHINE_VERSIONS"> @@ -801,6 +802,7 @@ <Property Name="PRODUCTION_DATE" Type="DateTime" Nullable="false" /> <Property Name="ORGANIZATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="MACHINE_VERSION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> + <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> </EntityType> <EntityType Name="MACHINES_CONFIGURATIONS"> <Key> @@ -822,7 +824,7 @@ <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> - <Property Name="EVENT_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> + <Property Name="EVENT_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="USER_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="DATE_TIME" Type="DateTime" Nullable="false" /> <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> @@ -977,9 +979,9 @@ <edmx:Mappings> <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs"> <EntityContainerMapping StorageEntityContainer="LocalModelStoreContainer" CdmEntityContainer="LocalDB"> - <EntitySetMapping Name="ACTIONS"> - <EntityTypeMapping TypeName="LocalModel.ACTION"> - <MappingFragment StoreEntitySet="ACTIONS"> + <EntitySetMapping Name="ACTION_TYPES"> + <EntityTypeMapping TypeName="LocalModel.ACTION_TYPES"> + <MappingFragment StoreEntitySet="ACTION_TYPES"> <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> <ScalarProperty Name="NAME" ColumnName="NAME" /> <ScalarProperty Name="CODE" ColumnName="CODE" /> @@ -1144,9 +1146,9 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="EVENTS"> - <EntityTypeMapping TypeName="LocalModel.EVENT"> - <MappingFragment StoreEntitySet="EVENTS"> + <EntitySetMapping Name="EVENT_TYPES"> + <EntityTypeMapping TypeName="LocalModel.EVENT_TYPES"> + <MappingFragment StoreEntitySet="EVENT_TYPES"> <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> <ScalarProperty Name="NAME" ColumnName="NAME" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> @@ -1156,11 +1158,11 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="EVENTS_ACTIONS"> - <EntityTypeMapping TypeName="LocalModel.EVENTS_ACTIONS"> - <MappingFragment StoreEntitySet="EVENTS_ACTIONS"> - <ScalarProperty Name="ACTION_GUID" ColumnName="ACTION_GUID" /> - <ScalarProperty Name="EVENT_GUID" ColumnName="EVENT_GUID" /> + <EntitySetMapping Name="EVENT_TYPES_ACTIONS"> + <EntityTypeMapping TypeName="LocalModel.EVENT_TYPES_ACTIONS"> + <MappingFragment StoreEntitySet="EVENT_TYPES_ACTIONS"> + <ScalarProperty Name="ACTION_TYPE_GUID" ColumnName="ACTION_TYPE_GUID" /> + <ScalarProperty Name="EVENT_TYPE_GUID" ColumnName="EVENT_TYPE_GUID" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> <ScalarProperty Name="GUID" ColumnName="GUID" /> @@ -1202,7 +1204,7 @@ <EntityTypeMapping TypeName="LocalModel.IDS_PACKS"> <MappingFragment StoreEntitySet="IDS_PACKS"> <ScalarProperty Name="CARTRIDGE_GUID" ColumnName="CARTRIDGE_GUID" /> - <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" /> + <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" /> <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" /> <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> @@ -1222,9 +1224,9 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="LIQUIDS"> - <EntityTypeMapping TypeName="LocalModel.LIQUID"> - <MappingFragment StoreEntitySet="LIQUIDS"> + <EntitySetMapping Name="LIQUID_TYPES"> + <EntityTypeMapping TypeName="LocalModel.LIQUID_TYPES"> + <MappingFragment StoreEntitySet="LIQUID_TYPES"> <ScalarProperty Name="VERSION" ColumnName="VERSION" /> <ScalarProperty Name="NAME" ColumnName="NAME" /> <ScalarProperty Name="CODE" ColumnName="CODE" /> @@ -1235,11 +1237,11 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="LIQUIDS_RMLS"> - <EntityTypeMapping TypeName="LocalModel.LIQUIDS_RMLS"> - <MappingFragment StoreEntitySet="LIQUIDS_RMLS"> + <EntitySetMapping Name="LIQUID_TYPES_RMLS"> + <EntityTypeMapping TypeName="LocalModel.LIQUID_TYPES_RMLS"> + <MappingFragment StoreEntitySet="LIQUID_TYPES_RMLS"> <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" /> - <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" /> + <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> <ScalarProperty Name="GUID" ColumnName="GUID" /> @@ -1261,6 +1263,7 @@ <EntitySetMapping Name="MACHINES"> <EntityTypeMapping TypeName="LocalModel.MACHINE"> <MappingFragment StoreEntitySet="MACHINES"> + <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" /> <ScalarProperty Name="MACHINE_VERSION_GUID" ColumnName="MACHINE_VERSION_GUID" /> <ScalarProperty Name="ORGANIZATION_GUID" ColumnName="ORGANIZATION_GUID" /> <ScalarProperty Name="PRODUCTION_DATE" ColumnName="PRODUCTION_DATE" /> @@ -1291,7 +1294,7 @@ <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> <ScalarProperty Name="DATE_TIME" ColumnName="DATE_TIME" /> <ScalarProperty Name="USER_GUID" ColumnName="USER_GUID" /> - <ScalarProperty Name="EVENT_GUID" ColumnName="EVENT_GUID" /> + <ScalarProperty Name="EVENT_TYPE_GUID" ColumnName="EVENT_TYPE_GUID" /> <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram index 350983c76..5bbf17d24 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram @@ -5,7 +5,7 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="67415a77da9a47f2810e9bfd67b9921a" Name="Diagram1"> - <EntityTypeShape EntityType="LocalModel.ACTION" Width="1.5" PointX="0.75" PointY="0.75" /> + <EntityTypeShape EntityType="LocalModel.ACTION_TYPES" Width="1.5" PointX="0.75" PointY="0.75" /> <EntityTypeShape EntityType="LocalModel.ADDRESS" Width="1.5" PointX="2.75" PointY="0.75" /> <EntityTypeShape EntityType="LocalModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.75" PointY="0.75" /> <EntityTypeShape EntityType="LocalModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="4.75" /> @@ -19,15 +19,15 @@ <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="8.75" PointY="0.75" /> <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="3.75" /> <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="6.75" /> - <EntityTypeShape EntityType="LocalModel.EVENT" Width="1.5" PointX="8.75" PointY="9.75" /> - <EntityTypeShape EntityType="LocalModel.EVENTS_ACTIONS" Width="1.5" PointX="10.75" PointY="0.75" /> + <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="8.75" PointY="9.75" /> + <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="0.75" /> <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="10.75" /> <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHESISES" Width="1.5" PointX="10.75" PointY="3.75" /> <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="6.75" /> <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="10.75" PointY="9.75" /> <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="2.75" PointY="11.75" /> - <EntityTypeShape EntityType="LocalModel.LIQUID" Width="1.5" PointX="4.75" PointY="11.75" /> - <EntityTypeShape EntityType="LocalModel.LIQUIDS_RMLS" Width="1.5" PointX="12.75" PointY="0.75" /> + <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="4.75" PointY="11.75" /> + <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="12.75" PointY="0.75" /> <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="12.75" PointY="3.75" /> <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="6.75" /> <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="6.75" PointY="12.75" /> diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs index b01607300..7bf83f80c 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs @@ -23,5 +23,6 @@ namespace Tango.DAL.Local.DB public System.DateTime PRODUCTION_DATE { get; set; } public string ORGANIZATION_GUID { get; set; } public string MACHINE_VERSION_GUID { get; set; } + public string CONFIGURATION_GUID { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs index 599ab3332..2b916274a 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs @@ -19,7 +19,7 @@ namespace Tango.DAL.Local.DB public System.DateTime LAST_UPDATED { get; set; } public bool DELETED { get; set; } public string MACHINE_GUID { get; set; } - public string EVENT_GUID { get; set; } + public string EVENT_TYPE_GUID { get; set; } public string USER_GUID { get; set; } public System.DateTime DATE_TIME { get; set; } public string DESCRIPTION { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj index db5f258a2..14625e59f 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj +++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj @@ -65,7 +65,7 @@ <Compile Include="..\Versioning\GlobalVersionInfo.cs"> <Link>GlobalVersionInfo.cs</Link> </Compile> - <Compile Include="DB\ACTION.cs"> + <Compile Include="DB\ACTION_TYPES.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> <Compile Include="DB\ADDRESS.cs"> @@ -107,10 +107,10 @@ <Compile Include="DB\EMBEDDED_SOFTWARE_VERSIONS.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> - <Compile Include="DB\EVENT.cs"> + <Compile Include="DB\EVENT_TYPES.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> - <Compile Include="DB\EVENTS_ACTIONS.cs"> + <Compile Include="DB\EVENT_TYPES_ACTIONS.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> <Compile Include="DB\FIBER_SHAPES.cs"> @@ -128,10 +128,10 @@ <Compile Include="DB\LINEAR_MASS_DENSITY_UNITS.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> - <Compile Include="DB\LIQUID.cs"> + <Compile Include="DB\LIQUID_TYPES.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> - <Compile Include="DB\LIQUIDS_RMLS.cs"> + <Compile Include="DB\LIQUID_TYPES_RMLS.cs"> <DependentUpon>LocalADO.tt</DependentUpon> </Compile> <Compile Include="DB\LocalADO.Context.cs"> diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Action.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ActionType.cs index f011fba71..7618320f8 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Action.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ActionType.cs @@ -6,13 +6,13 @@ using Tango.DAL.Remote.DB; namespace Tango.DAL.Observables { - [EntityFieldName("ACTIONS")] - public class Action : ObservableEntity<ACTION> + [EntityFieldName("ACTION_TYPES")] + public class ActionType : ObservableEntity<ACTION_TYPES> { private Int32 _code; /// <summary> - /// Gets or sets the action code. + /// Gets or sets the actiontype code. /// </summary> [EntityFieldName("CODE")] public Int32 Code @@ -31,7 +31,7 @@ namespace Tango.DAL.Observables private String _name; /// <summary> - /// Gets or sets the action name. + /// Gets or sets the actiontype name. /// </summary> [EntityFieldName("NAME")] public String Name @@ -50,7 +50,7 @@ namespace Tango.DAL.Observables private String _description; /// <summary> - /// Gets or sets the action description. + /// Gets or sets the actiontype description. /// </summary> [EntityFieldName("DESCRIPTION")] public String Description @@ -67,38 +67,38 @@ namespace Tango.DAL.Observables } - private ObservableCollection<EventsAction> _eventsactions; + private ObservableCollection<EventTypesAction> _eventtypesactions; /// <summary> - /// Gets or sets the action events actions. + /// Gets or sets the actiontype event types actions. /// </summary> - [EntityFieldName("EVENTS_ACTIONS")] - public ObservableCollection<EventsAction> EventsActions + [EntityFieldName("EVENT_TYPES_ACTIONS")] + public ObservableCollection<EventTypesAction> EventTypesActions { get { - return _eventsactions; + return _eventtypesactions; } set { - _eventsactions = value; RaisePropertyChanged(nameof(EventsActions)); + _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); } } /// <summary> - /// Initializes a new instance of the <see cref="Action" /> class. + /// Initializes a new instance of the <see cref="ActionType" /> class. /// </summary> - public Action() : base() + public ActionType() : base() { Init(); } /// <summary> - /// Initializes a new instance of the <see cref="Action" /> class. + /// Initializes a new instance of the <see cref="ActionType" /> class. /// </summary> /// <param name="entity">The entity.</param> - public Action(ACTION entity) : base(entity) + public ActionType(ACTION_TYPES entity) : base(entity) { Init(); MapEntityToObservable(entity, this); @@ -110,7 +110,7 @@ namespace Tango.DAL.Observables private void Init() { - EventsActions = new ObservableCollection<EventsAction>(); + EventTypesActions = new ObservableCollection<EventTypesAction>(); } } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Event.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventType.cs index 6ff14beb0..85153d393 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Event.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventType.cs @@ -6,13 +6,13 @@ using Tango.DAL.Remote.DB; namespace Tango.DAL.Observables { - [EntityFieldName("EVENTS")] - public class Event : ObservableEntity<EVENT> + [EntityFieldName("EVENT_TYPES")] + public class EventType : ObservableEntity<EVENT_TYPES> { private Int32 _code; /// <summary> - /// Gets or sets the event code. + /// Gets or sets the eventtype code. /// </summary> [EntityFieldName("CODE")] public Int32 Code @@ -31,7 +31,7 @@ namespace Tango.DAL.Observables private String _name; /// <summary> - /// Gets or sets the event name. + /// Gets or sets the eventtype name. /// </summary> [EntityFieldName("NAME")] public String Name @@ -50,7 +50,7 @@ namespace Tango.DAL.Observables private String _description; /// <summary> - /// Gets or sets the event description. + /// Gets or sets the eventtype description. /// </summary> [EntityFieldName("DESCRIPTION")] public String Description @@ -67,28 +67,28 @@ namespace Tango.DAL.Observables } - private ObservableCollection<EventsAction> _eventsactions; + private ObservableCollection<EventTypesAction> _eventtypesactions; /// <summary> - /// Gets or sets the event events actions. + /// Gets or sets the eventtype event types actions. /// </summary> - [EntityFieldName("EVENTS_ACTIONS")] - public ObservableCollection<EventsAction> EventsActions + [EntityFieldName("EVENT_TYPES_ACTIONS")] + public ObservableCollection<EventTypesAction> EventTypesActions { get { - return _eventsactions; + return _eventtypesactions; } set { - _eventsactions = value; RaisePropertyChanged(nameof(EventsActions)); + _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); } } private ObservableCollection<MachinesEvent> _machinesevents; /// <summary> - /// Gets or sets the event machines events. + /// Gets or sets the eventtype machines events. /// </summary> [EntityFieldName("MACHINES_EVENTS")] public ObservableCollection<MachinesEvent> MachinesEvents @@ -106,18 +106,18 @@ namespace Tango.DAL.Observables } /// <summary> - /// Initializes a new instance of the <see cref="Event" /> class. + /// Initializes a new instance of the <see cref="EventType" /> class. /// </summary> - public Event() : base() + public EventType() : base() { Init(); } /// <summary> - /// Initializes a new instance of the <see cref="Event" /> class. + /// Initializes a new instance of the <see cref="EventType" /> class. /// </summary> /// <param name="entity">The entity.</param> - public Event(EVENT entity) : base(entity) + public EventType(EVENT_TYPES entity) : base(entity) { Init(); MapEntityToObservable(entity, this); @@ -129,7 +129,7 @@ namespace Tango.DAL.Observables private void Init() { - EventsActions = new ObservableCollection<EventsAction>(); + EventTypesActions = new ObservableCollection<EventTypesAction>(); MachinesEvents = new ObservableCollection<MachinesEvent>(); diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventTypesAction.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventTypesAction.cs new file mode 100644 index 000000000..93983202e --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventTypesAction.cs @@ -0,0 +1,114 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.DAL.Observables +{ + [EntityFieldName("EVENT_TYPES_ACTIONS")] + public class EventTypesAction : ObservableEntity<EVENT_TYPES_ACTIONS> + { + + private String _eventtypeguid; + /// <summary> + /// Gets or sets the eventtypesaction event type guid. + /// </summary> + [EntityFieldName("EVENT_TYPE_GUID")] + public String EventTypeGuid + { + get + { + return _eventtypeguid; + } + + set + { + _eventtypeguid = value; RaisePropertyChanged(nameof(EventTypeGuid)); + } + + } + + private String _actiontypeguid; + /// <summary> + /// Gets or sets the eventtypesaction action type guid. + /// </summary> + [EntityFieldName("ACTION_TYPE_GUID")] + public String ActionTypeGuid + { + get + { + return _actiontypeguid; + } + + set + { + _actiontypeguid = value; RaisePropertyChanged(nameof(ActionTypeGuid)); + } + + } + + private ActionType _actiontypes; + /// <summary> + /// Gets or sets the eventtypesaction action types. + /// </summary> + [EntityFieldName("ACTION_TYPES")] + public ActionType ActionTypes + { + get + { + return _actiontypes; + } + + set + { + _actiontypes = value; RaisePropertyChanged(nameof(ActionTypes)); + } + + } + + private EventType _eventtypes; + /// <summary> + /// Gets or sets the eventtypesaction event types. + /// </summary> + [EntityFieldName("EVENT_TYPES")] + public EventType EventTypes + { + get + { + return _eventtypes; + } + + set + { + _eventtypes = value; RaisePropertyChanged(nameof(EventTypes)); + } + + } + + /// <summary> + /// Initializes a new instance of the <see cref="EventTypesAction" /> class. + /// </summary> + public EventTypesAction() : base() + { + Init(); + } + + /// <summary> + /// Initializes a new instance of the <see cref="EventTypesAction" /> class. + /// </summary> + /// <param name="entity">The entity.</param> + public EventTypesAction(EVENT_TYPES_ACTIONS entity) : base(entity) + { + Init(); + MapEntityToObservable(entity, this); + } + + /// <summary> + /// Initialize complex types. + /// </summary> + private void Init() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventsAction.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventsAction.cs deleted file mode 100644 index 591ff2a47..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventsAction.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [EntityFieldName("EVENTS_ACTIONS")] - public class EventsAction : ObservableEntity<EVENTS_ACTIONS> - { - - private String _eventguid; - /// <summary> - /// Gets or sets the eventsaction event guid. - /// </summary> - [EntityFieldName("EVENT_GUID")] - public String EventGuid - { - get - { - return _eventguid; - } - - set - { - _eventguid = value; RaisePropertyChanged(nameof(EventGuid)); - } - - } - - private String _actionguid; - /// <summary> - /// Gets or sets the eventsaction action guid. - /// </summary> - [EntityFieldName("ACTION_GUID")] - public String ActionGuid - { - get - { - return _actionguid; - } - - set - { - _actionguid = value; RaisePropertyChanged(nameof(ActionGuid)); - } - - } - - private Action _action; - /// <summary> - /// Gets or sets the eventsaction action. - /// </summary> - [EntityFieldName("ACTION")] - public Action Action - { - get - { - return _action; - } - - set - { - _action = value; RaisePropertyChanged(nameof(Action)); - } - - } - - private Event _event; - /// <summary> - /// Gets or sets the eventsaction event. - /// </summary> - [EntityFieldName("EVENT")] - public Event Event - { - get - { - return _event; - } - - set - { - _event = value; RaisePropertyChanged(nameof(Event)); - } - - } - - /// <summary> - /// Initializes a new instance of the <see cref="EventsAction" /> class. - /// </summary> - public EventsAction() : base() - { - Init(); - } - - /// <summary> - /// Initializes a new instance of the <see cref="EventsAction" /> class. - /// </summary> - /// <param name="entity">The entity.</param> - public EventsAction(EVENTS_ACTIONS entity) : base(entity) - { - Init(); - MapEntityToObservable(entity, this); - } - - /// <summary> - /// Initialize complex types. - /// </summary> - private void Init() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs index 20de3c46d..787435950 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs @@ -48,21 +48,21 @@ namespace Tango.DAL.Observables } - private String _liquidguid; + private String _liquidtypeguid; /// <summary> - /// Gets or sets the idspack liquid guid. + /// Gets or sets the idspack liquid type guid. /// </summary> - [EntityFieldName("LIQUID_GUID")] - public String LiquidGuid + [EntityFieldName("LIQUID_TYPE_GUID")] + public String LiquidTypeGuid { get { - return _liquidguid; + return _liquidtypeguid; } set { - _liquidguid = value; RaisePropertyChanged(nameof(LiquidGuid)); + _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); } } @@ -162,21 +162,21 @@ namespace Tango.DAL.Observables } - private Liquid _liquid; + private LiquidType _liquidtypes; /// <summary> - /// Gets or sets the idspack liquid. + /// Gets or sets the idspack liquid types. /// </summary> - [EntityFieldName("LIQUID")] - public Liquid Liquid + [EntityFieldName("LIQUID_TYPES")] + public LiquidType LiquidTypes { get { - return _liquid; + return _liquidtypes; } set { - _liquid = value; RaisePropertyChanged(nameof(Liquid)); + _liquidtypes = value; RaisePropertyChanged(nameof(LiquidTypes)); } } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Liquid.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs index 13e8eb15a..613d6a739 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Liquid.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs @@ -6,13 +6,13 @@ using Tango.DAL.Remote.DB; namespace Tango.DAL.Observables { - [EntityFieldName("LIQUIDS")] - public class Liquid : ObservableEntity<LIQUID> + [EntityFieldName("LIQUID_TYPES")] + public class LiquidType : ObservableEntity<LIQUID_TYPES> { private Int32 _code; /// <summary> - /// Gets or sets the liquid code. + /// Gets or sets the liquidtype code. /// </summary> [EntityFieldName("CODE")] public Int32 Code @@ -31,7 +31,7 @@ namespace Tango.DAL.Observables private String _name; /// <summary> - /// Gets or sets the liquid name. + /// Gets or sets the liquidtype name. /// </summary> [EntityFieldName("NAME")] public String Name @@ -50,7 +50,7 @@ namespace Tango.DAL.Observables private Double _version; /// <summary> - /// Gets or sets the liquid version. + /// Gets or sets the liquidtype version. /// </summary> [EntityFieldName("VERSION")] public Double Version @@ -69,7 +69,7 @@ namespace Tango.DAL.Observables private Int32 _color; /// <summary> - /// Gets or sets the liquid color. + /// Gets or sets the liquidtype color. /// </summary> [EntityFieldName("COLOR")] public Int32 Color @@ -88,7 +88,7 @@ namespace Tango.DAL.Observables private ObservableCollection<IdsPack> _idspacks; /// <summary> - /// Gets or sets the liquid ids packs. + /// Gets or sets the liquidtype ids packs. /// </summary> [EntityFieldName("IDS_PACKS")] public ObservableCollection<IdsPack> IdsPacks @@ -105,38 +105,38 @@ namespace Tango.DAL.Observables } - private ObservableCollection<LiquidsRml> _liquidsrmls; + private ObservableCollection<LiquidTypesRml> _liquidtypesrmls; /// <summary> - /// Gets or sets the liquid liquids rmls. + /// Gets or sets the liquidtype liquid types rmls. /// </summary> - [EntityFieldName("LIQUIDS_RMLS")] - public ObservableCollection<LiquidsRml> LiquidsRmls + [EntityFieldName("LIQUID_TYPES_RMLS")] + public ObservableCollection<LiquidTypesRml> LiquidTypesRmls { get { - return _liquidsrmls; + return _liquidtypesrmls; } set { - _liquidsrmls = value; RaisePropertyChanged(nameof(LiquidsRmls)); + _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); } } /// <summary> - /// Initializes a new instance of the <see cref="Liquid" /> class. + /// Initializes a new instance of the <see cref="LiquidType" /> class. /// </summary> - public Liquid() : base() + public LiquidType() : base() { Init(); } /// <summary> - /// Initializes a new instance of the <see cref="Liquid" /> class. + /// Initializes a new instance of the <see cref="LiquidType" /> class. /// </summary> /// <param name="entity">The entity.</param> - public Liquid(LIQUID entity) : base(entity) + public LiquidType(LIQUID_TYPES entity) : base(entity) { Init(); MapEntityToObservable(entity, this); @@ -150,7 +150,7 @@ namespace Tango.DAL.Observables IdsPacks = new ObservableCollection<IdsPack>(); - LiquidsRmls = new ObservableCollection<LiquidsRml>(); + LiquidTypesRmls = new ObservableCollection<LiquidTypesRml>(); } } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidsRml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs index b12a3cef6..5b5d73fef 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidsRml.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs @@ -6,32 +6,32 @@ using Tango.DAL.Remote.DB; namespace Tango.DAL.Observables { - [EntityFieldName("LIQUIDS_RMLS")] - public class LiquidsRml : ObservableEntity<LIQUIDS_RMLS> + [EntityFieldName("LIQUID_TYPES_RMLS")] + public class LiquidTypesRml : ObservableEntity<LIQUID_TYPES_RMLS> { - private String _liquidguid; + private String _liquidtypeguid; /// <summary> - /// Gets or sets the liquidsrml liquid guid. + /// Gets or sets the liquidtypesrml liquid type guid. /// </summary> - [EntityFieldName("LIQUID_GUID")] - public String LiquidGuid + [EntityFieldName("LIQUID_TYPE_GUID")] + public String LiquidTypeGuid { get { - return _liquidguid; + return _liquidtypeguid; } set { - _liquidguid = value; RaisePropertyChanged(nameof(LiquidGuid)); + _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); } } private String _rmlguid; /// <summary> - /// Gets or sets the liquidsrml rml guid. + /// Gets or sets the liquidtypesrml rml guid. /// </summary> [EntityFieldName("RML_GUID")] public String RmlGuid @@ -48,28 +48,28 @@ namespace Tango.DAL.Observables } - private Liquid _liquid; + private LiquidType _liquidtypes; /// <summary> - /// Gets or sets the liquidsrml liquid. + /// Gets or sets the liquidtypesrml liquid types. /// </summary> - [EntityFieldName("LIQUID")] - public Liquid Liquid + [EntityFieldName("LIQUID_TYPES")] + public LiquidType LiquidTypes { get { - return _liquid; + return _liquidtypes; } set { - _liquid = value; RaisePropertyChanged(nameof(Liquid)); + _liquidtypes = value; RaisePropertyChanged(nameof(LiquidTypes)); } } private Rml _rml; /// <summary> - /// Gets or sets the liquidsrml rml. + /// Gets or sets the liquidtypesrml rml. /// </summary> [EntityFieldName("RML")] public Rml Rml @@ -87,18 +87,18 @@ namespace Tango.DAL.Observables } /// <summary> - /// Initializes a new instance of the <see cref="LiquidsRml" /> class. + /// Initializes a new instance of the <see cref="LiquidTypesRml" /> class. /// </summary> - public LiquidsRml() : base() + public LiquidTypesRml() : base() { Init(); } /// <summary> - /// Initializes a new instance of the <see cref="LiquidsRml" /> class. + /// Initializes a new instance of the <see cref="LiquidTypesRml" /> class. /// </summary> /// <param name="entity">The entity.</param> - public LiquidsRml(LIQUIDS_RMLS entity) : base(entity) + public LiquidTypesRml(LIQUID_TYPES_RMLS entity) : base(entity) { Init(); MapEntityToObservable(entity, this); diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesEvent.cs index a7a2c35f2..b07959409 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesEvent.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesEvent.cs @@ -29,21 +29,21 @@ namespace Tango.DAL.Observables } - private String _eventguid; + private String _eventtypeguid; /// <summary> - /// Gets or sets the machinesevent event guid. + /// Gets or sets the machinesevent event type guid. /// </summary> - [EntityFieldName("EVENT_GUID")] - public String EventGuid + [EntityFieldName("EVENT_TYPE_GUID")] + public String EventTypeGuid { get { - return _eventguid; + return _eventtypeguid; } set { - _eventguid = value; RaisePropertyChanged(nameof(EventGuid)); + _eventtypeguid = value; RaisePropertyChanged(nameof(EventTypeGuid)); } } @@ -105,21 +105,21 @@ namespace Tango.DAL.Observables } - private Event _event; + private EventType _eventtypes; /// <summary> - /// Gets or sets the machinesevent event. + /// Gets or sets the machinesevent event types. /// </summary> - [EntityFieldName("EVENT")] - public Event Event + [EntityFieldName("EVENT_TYPES")] + public EventType EventTypes { get { - return _event; + return _eventtypes; } set { - _event = value; RaisePropertyChanged(nameof(Event)); + _eventtypes = value; RaisePropertyChanged(nameof(EventTypes)); } } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs index 1a2d31fe1..df2302456 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs @@ -409,21 +409,21 @@ namespace Tango.DAL.Observables } - private ObservableCollection<LiquidsRml> _liquidsrmls; + private ObservableCollection<LiquidTypesRml> _liquidtypesrmls; /// <summary> - /// Gets or sets the rml liquids rmls. + /// Gets or sets the rml liquid types rmls. /// </summary> - [EntityFieldName("LIQUIDS_RMLS")] - public ObservableCollection<LiquidsRml> LiquidsRmls + [EntityFieldName("LIQUID_TYPES_RMLS")] + public ObservableCollection<LiquidTypesRml> LiquidTypesRmls { get { - return _liquidsrmls; + return _liquidtypesrmls; } set { - _liquidsrmls = value; RaisePropertyChanged(nameof(LiquidsRmls)); + _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); } } @@ -528,7 +528,7 @@ namespace Tango.DAL.Observables private void Init() { - LiquidsRmls = new ObservableCollection<LiquidsRml>(); + LiquidTypesRmls = new ObservableCollection<LiquidTypesRml>(); } } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ActionTypes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ActionTypes.cs new file mode 100644 index 000000000..750b1b4ab --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ActionTypes.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.DAL.Observables +{ + public enum ActionTypes + { + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/EventTypes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/EventTypes.cs new file mode 100644 index 000000000..4321c9f9f --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/EventTypes.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.DAL.Observables +{ + public enum EventTypes + { + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LiquidTypes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LiquidTypes.cs new file mode 100644 index 000000000..79bb28717 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LiquidTypes.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.DAL.Observables +{ + public enum LiquidTypes + { + + /// <summary> + /// (Cyan) + /// </summary> + [Description("Cyan")] + Cyan = 1, + + /// <summary> + /// (Magenta) + /// </summary> + [Description("Magenta")] + Magenta = 2, + + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs index 0be7419e1..738cdc576 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs @@ -114,7 +114,7 @@ namespace Tango.DAL.Observables DispenserTypes = Context.DISPENSER_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<DispenserType>(x)).ToObservableCollection(); - Liquids = Context.LIQUIDS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Liquid>(x)).ToObservableCollection(); + LiquidTypes = Context.LIQUID_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<LiquidType>(x)).ToObservableCollection(); Cartridges = Context.CARTRIDGES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Cartridge>(x)).ToObservableCollection(); diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs index 9fdab5b8b..8b17c1182 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs @@ -6,38 +6,38 @@ namespace Tango.DAL.Observables public partial class ObservablesEntitiesAdapter { - private ObservableCollection<Action> _actions; + private ObservableCollection<ActionType> _actiontypes; /// <summary> - /// Gets or sets the Actions. + /// Gets or sets the ActionTypes. /// </summary> - public ObservableCollection<Action> Actions + public ObservableCollection<ActionType> ActionTypes { get { - return _actions; + return _actiontypes; } set { - _actions = value; RaisePropertyChanged(nameof(Actions)); + _actiontypes = value; RaisePropertyChanged(nameof(ActionTypes)); } } - private ICollectionView _actionsViewSource; + private ICollectionView _actiontypesViewSource; /// <summary> - /// Gets or sets the Actions View Source. + /// Gets or sets the ActionTypes View Source. ///</summary> - public ICollectionView ActionsViewSource + public ICollectionView ActionTypesViewSource { get { - return _actionsViewSource; + return _actiontypesViewSource; } set { - _actionsViewSource = value; RaisePropertyChanged(nameof(ActionsViewSource)); + _actiontypesViewSource = value; RaisePropertyChanged(nameof(ActionTypesViewSource)); } } @@ -510,74 +510,74 @@ namespace Tango.DAL.Observables } - private ObservableCollection<Event> _events; + private ObservableCollection<EventType> _eventtypes; /// <summary> - /// Gets or sets the Events. + /// Gets or sets the EventTypes. /// </summary> - public ObservableCollection<Event> Events + public ObservableCollection<EventType> EventTypes { get { - return _events; + return _eventtypes; } set { - _events = value; RaisePropertyChanged(nameof(Events)); + _eventtypes = value; RaisePropertyChanged(nameof(EventTypes)); } } - private ICollectionView _eventsViewSource; + private ICollectionView _eventtypesViewSource; /// <summary> - /// Gets or sets the Events View Source. + /// Gets or sets the EventTypes View Source. ///</summary> - public ICollectionView EventsViewSource + public ICollectionView EventTypesViewSource { get { - return _eventsViewSource; + return _eventtypesViewSource; } set { - _eventsViewSource = value; RaisePropertyChanged(nameof(EventsViewSource)); + _eventtypesViewSource = value; RaisePropertyChanged(nameof(EventTypesViewSource)); } } - private ObservableCollection<EventsAction> _eventsactions; + private ObservableCollection<EventTypesAction> _eventtypesactions; /// <summary> - /// Gets or sets the EventsActions. + /// Gets or sets the EventTypesActions. /// </summary> - public ObservableCollection<EventsAction> EventsActions + public ObservableCollection<EventTypesAction> EventTypesActions { get { - return _eventsactions; + return _eventtypesactions; } set { - _eventsactions = value; RaisePropertyChanged(nameof(EventsActions)); + _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); } } - private ICollectionView _eventsactionsViewSource; + private ICollectionView _eventtypesactionsViewSource; /// <summary> - /// Gets or sets the EventsActions View Source. + /// Gets or sets the EventTypesActions View Source. ///</summary> - public ICollectionView EventsActionsViewSource + public ICollectionView EventTypesActionsViewSource { get { - return _eventsactionsViewSource; + return _eventtypesactionsViewSource; } set { - _eventsactionsViewSource = value; RaisePropertyChanged(nameof(EventsActionsViewSource)); + _eventtypesactionsViewSource = value; RaisePropertyChanged(nameof(EventTypesActionsViewSource)); } } @@ -762,74 +762,74 @@ namespace Tango.DAL.Observables } - private ObservableCollection<Liquid> _liquids; + private ObservableCollection<LiquidType> _liquidtypes; /// <summary> - /// Gets or sets the Liquids. + /// Gets or sets the LiquidTypes. /// </summary> - public ObservableCollection<Liquid> Liquids + public ObservableCollection<LiquidType> LiquidTypes { get { - return _liquids; + return _liquidtypes; } set { - _liquids = value; RaisePropertyChanged(nameof(Liquids)); + _liquidtypes = value; RaisePropertyChanged(nameof(LiquidTypes)); } } - private ICollectionView _liquidsViewSource; + private ICollectionView _liquidtypesViewSource; /// <summary> - /// Gets or sets the Liquids View Source. + /// Gets or sets the LiquidTypes View Source. ///</summary> - public ICollectionView LiquidsViewSource + public ICollectionView LiquidTypesViewSource { get { - return _liquidsViewSource; + return _liquidtypesViewSource; } set { - _liquidsViewSource = value; RaisePropertyChanged(nameof(LiquidsViewSource)); + _liquidtypesViewSource = value; RaisePropertyChanged(nameof(LiquidTypesViewSource)); } } - private ObservableCollection<LiquidsRml> _liquidsrmls; + private ObservableCollection<LiquidTypesRml> _liquidtypesrmls; /// <summary> - /// Gets or sets the LiquidsRmls. + /// Gets or sets the LiquidTypesRmls. /// </summary> - public ObservableCollection<LiquidsRml> LiquidsRmls + public ObservableCollection<LiquidTypesRml> LiquidTypesRmls { get { - return _liquidsrmls; + return _liquidtypesrmls; } set { - _liquidsrmls = value; RaisePropertyChanged(nameof(LiquidsRmls)); + _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); } } - private ICollectionView _liquidsrmlsViewSource; + private ICollectionView _liquidtypesrmlsViewSource; /// <summary> - /// Gets or sets the LiquidsRmls View Source. + /// Gets or sets the LiquidTypesRmls View Source. ///</summary> - public ICollectionView LiquidsRmlsViewSource + public ICollectionView LiquidTypesRmlsViewSource { get { - return _liquidsrmlsViewSource; + return _liquidtypesrmlsViewSource; } set { - _liquidsrmlsViewSource = value; RaisePropertyChanged(nameof(LiquidsRmlsViewSource)); + _liquidtypesrmlsViewSource = value; RaisePropertyChanged(nameof(LiquidTypesRmlsViewSource)); } } @@ -1416,7 +1416,7 @@ namespace Tango.DAL.Observables private void InitCollectionSources() { - ActionsViewSource = CreateCollectionView(Actions); + ActionTypesViewSource = CreateCollectionView(ActionTypes); AddressesViewSource = CreateCollectionView(Addresses); @@ -1444,9 +1444,9 @@ namespace Tango.DAL.Observables EmbeddedSoftwareVersionsViewSource = CreateCollectionView(EmbeddedSoftwareVersions); - EventsViewSource = CreateCollectionView(Events); + EventTypesViewSource = CreateCollectionView(EventTypes); - EventsActionsViewSource = CreateCollectionView(EventsActions); + EventTypesActionsViewSource = CreateCollectionView(EventTypesActions); FiberShapesViewSource = CreateCollectionView(FiberShapes); @@ -1458,9 +1458,9 @@ namespace Tango.DAL.Observables LinearMassDensityUnitsViewSource = CreateCollectionView(LinearMassDensityUnits); - LiquidsViewSource = CreateCollectionView(Liquids); + LiquidTypesViewSource = CreateCollectionView(LiquidTypes); - LiquidsRmlsViewSource = CreateCollectionView(LiquidsRmls); + LiquidTypesRmlsViewSource = CreateCollectionView(LiquidTypesRmls); MachineVersionsViewSource = CreateCollectionView(MachineVersions); diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj index ad432b98a..096b12d91 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj +++ b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj @@ -56,7 +56,12 @@ <Compile Include="..\Versioning\GlobalVersionInfo.cs"> <Link>GlobalVersionInfo.cs</Link> </Compile> + <Compile Include="Entities\ActionType.cs" /> + <Compile Include="Entities\EventType.cs" /> + <Compile Include="Entities\EventTypesAction.cs" /> <Compile Include="Entities\FiberSynth.cs" /> + <Compile Include="Entities\LiquidType.cs" /> + <Compile Include="Entities\LiquidTypesRml.cs" /> <Compile Include="EntityFieldNameAttribute.cs" /> <Compile Include="Enumerations\Actions.cs" /> <Compile Include="Enumerations\CartridgeTypes.cs" /> @@ -80,7 +85,6 @@ <Compile Include="ObservablesEntitiesAdapter.cs" /> <Compile Include="ObservablesEntitiesAdapterExtension.cs" /> <Compile Include="ObservablesGenerator.cs" /> - <Compile Include="Entities\Action.cs" /> <Compile Include="Entities\Address.cs" /> <Compile Include="Entities\ApplicationDisplayPanelVersion.cs" /> <Compile Include="Entities\ApplicationFirmwareVersion.cs" /> @@ -94,14 +98,10 @@ <Compile Include="Entities\DispenserType.cs" /> <Compile Include="Entities\EmbeddedFirmwareVersion.cs" /> <Compile Include="Entities\EmbeddedSoftwareVersion.cs" /> - <Compile Include="Entities\Event.cs" /> - <Compile Include="Entities\EventsAction.cs" /> <Compile Include="Entities\FiberShape.cs" /> <Compile Include="Entities\HardwareVersion.cs" /> <Compile Include="Entities\IdsPack.cs" /> <Compile Include="Entities\LinearMassDensityUnit.cs" /> - <Compile Include="Entities\Liquid.cs" /> - <Compile Include="Entities\LiquidsRml.cs" /> <Compile Include="Entities\Machine.cs" /> <Compile Include="Entities\MachinesConfiguration.cs" /> <Compile Include="Entities\MachinesEvent.cs" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs index 3f39ea77d..1c71eb314 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs @@ -12,12 +12,12 @@ namespace Tango.DAL.Remote.DB using System; using System.Collections.Generic; - public partial class ACTION + public partial class ACTION_TYPES { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public ACTION() + public ACTION_TYPES() { - this.EVENTS_ACTIONS = new HashSet<EVENTS_ACTIONS>(); + this.EVENT_TYPES_ACTIONS = new HashSet<EVENT_TYPES_ACTIONS>(); } public int ID { get; set; } @@ -29,6 +29,6 @@ namespace Tango.DAL.Remote.DB public string DESCRIPTION { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<EVENTS_ACTIONS> EVENTS_ACTIONS { get; set; } + public virtual ICollection<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs index 556d2d789..1eb478383 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs @@ -12,12 +12,12 @@ namespace Tango.DAL.Remote.DB using System; using System.Collections.Generic; - public partial class EVENT + public partial class EVENT_TYPES { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public EVENT() + public EVENT_TYPES() { - this.EVENTS_ACTIONS = new HashSet<EVENTS_ACTIONS>(); + this.EVENT_TYPES_ACTIONS = new HashSet<EVENT_TYPES_ACTIONS>(); this.MACHINES_EVENTS = new HashSet<MACHINES_EVENTS>(); } @@ -30,7 +30,7 @@ namespace Tango.DAL.Remote.DB public string DESCRIPTION { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<EVENTS_ACTIONS> EVENTS_ACTIONS { get; set; } + public virtual ICollection<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<MACHINES_EVENTS> MACHINES_EVENTS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENTS_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs index 9b20e63e4..003e4293e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENTS_ACTIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs @@ -12,16 +12,16 @@ namespace Tango.DAL.Remote.DB using System; using System.Collections.Generic; - public partial class EVENTS_ACTIONS + public partial class EVENT_TYPES_ACTIONS { public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } public bool DELETED { get; set; } - public string EVENT_GUID { get; set; } - public string ACTION_GUID { get; set; } + public string EVENT_TYPE_GUID { get; set; } + public string ACTION_TYPE_GUID { get; set; } - public virtual ACTION ACTION { get; set; } - public virtual EVENT EVENT { get; set; } + public virtual ACTION_TYPES ACTION_TYPES { get; set; } + public virtual EVENT_TYPES EVENT_TYPES { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs index 3f9a3da78..247d398da 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs @@ -20,13 +20,13 @@ namespace Tango.DAL.Remote.DB public bool DELETED { get; set; } public string CONFIGURATION_GUID { get; set; } public string DISPENSER_GUID { get; set; } - public string LIQUID_GUID { get; set; } + public string LIQUID_TYPE_GUID { get; set; } public string CARTRIDGE_GUID { get; set; } public string NAME { get; set; } public virtual CARTRIDGE CARTRIDGE { get; set; } public virtual CONFIGURATION CONFIGURATION { get; set; } public virtual DISPENSER DISPENSER { get; set; } - public virtual LIQUID LIQUID { get; set; } + public virtual LIQUID_TYPES LIQUID_TYPES { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs index b6a4ce67c..13821ad8d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs @@ -12,13 +12,13 @@ namespace Tango.DAL.Remote.DB using System; using System.Collections.Generic; - public partial class LIQUID + public partial class LIQUID_TYPES { [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public LIQUID() + public LIQUID_TYPES() { this.IDS_PACKS = new HashSet<IDS_PACKS>(); - this.LIQUIDS_RMLS = new HashSet<LIQUIDS_RMLS>(); + this.LIQUID_TYPES_RMLS = new HashSet<LIQUID_TYPES_RMLS>(); } public int ID { get; set; } @@ -33,6 +33,6 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<LIQUIDS_RMLS> LIQUIDS_RMLS { get; set; } + public virtual ICollection<LIQUID_TYPES_RMLS> LIQUID_TYPES_RMLS { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUIDS_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs index 4cf186ab5..c77b4fa5d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUIDS_RMLS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs @@ -12,16 +12,16 @@ namespace Tango.DAL.Remote.DB using System; using System.Collections.Generic; - public partial class LIQUIDS_RMLS + public partial class LIQUID_TYPES_RMLS { public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } public bool DELETED { get; set; } - public string LIQUID_GUID { get; set; } + public string LIQUID_TYPE_GUID { get; set; } public string RML_GUID { get; set; } - public virtual LIQUID LIQUID { get; set; } + public virtual LIQUID_TYPES LIQUID_TYPES { get; set; } public virtual RML RML { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs index 9c5be6ae4..1f24cc1f9 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs @@ -19,12 +19,12 @@ namespace Tango.DAL.Remote.DB public System.DateTime LAST_UPDATED { get; set; } public bool DELETED { get; set; } public string MACHINE_GUID { get; set; } - public string EVENT_GUID { get; set; } + public string EVENT_TYPE_GUID { get; set; } public string USER_GUID { get; set; } public System.DateTime DATE_TIME { get; set; } public string DESCRIPTION { get; set; } - public virtual EVENT EVENT { get; set; } + public virtual EVENT_TYPES EVENT_TYPES { get; set; } public virtual MACHINE MACHINE { get; set; } public virtual USER USER { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs index 3e7ff1dd4..adf1cc8d2 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -17,7 +17,7 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public RML() { - this.LIQUIDS_RMLS = new HashSet<LIQUIDS_RMLS>(); + this.LIQUID_TYPES_RMLS = new HashSet<LIQUID_TYPES_RMLS>(); } public int ID { get; set; } @@ -47,7 +47,7 @@ namespace Tango.DAL.Remote.DB public virtual FIBER_SYNTHS FIBER_SYNTHS { get; set; } public virtual LINEAR_MASS_DENSITY_UNITS LINEAR_MASS_DENSITY_UNITS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection<LIQUIDS_RMLS> LIQUIDS_RMLS { get; set; } + public virtual ICollection<LIQUID_TYPES_RMLS> LIQUID_TYPES_RMLS { get; set; } public virtual MEDIA_COLORS MEDIA_COLORS { get; set; } public virtual MEDIA_CONDITIONS MEDIA_CONDITIONS { get; set; } public virtual MEDIA_MATERIALS MEDIA_MATERIALS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs index 1122fee30..7af957ce4 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -25,7 +25,7 @@ namespace Tango.DAL.Remote.DB throw new UnintentionalCodeFirstException(); } - public virtual DbSet<ACTION> ACTIONS { get; set; } + public virtual DbSet<ACTION_TYPES> ACTION_TYPES { get; set; } public virtual DbSet<ADDRESS> ADDRESSES { get; set; } public virtual DbSet<APPLICATION_DISPLAY_PANEL_VERSIONS> APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; } public virtual DbSet<APPLICATION_FIRMWARE_VERSIONS> APPLICATION_FIRMWARE_VERSIONS { get; set; } @@ -39,15 +39,15 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<DISPENSER> DISPENSERS { get; set; } public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; } public virtual DbSet<EMBEDDED_SOFTWARE_VERSIONS> EMBEDDED_SOFTWARE_VERSIONS { get; set; } - public virtual DbSet<EVENT> EVENTS { get; set; } - public virtual DbSet<EVENTS_ACTIONS> EVENTS_ACTIONS { get; set; } + public virtual DbSet<EVENT_TYPES> EVENT_TYPES { get; set; } + public virtual DbSet<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; } public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; } public virtual DbSet<FIBER_SYNTHS> FIBER_SYNTHS { get; set; } public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; } public virtual DbSet<IDS_PACKS> IDS_PACKS { get; set; } public virtual DbSet<LINEAR_MASS_DENSITY_UNITS> LINEAR_MASS_DENSITY_UNITS { get; set; } - public virtual DbSet<LIQUID> LIQUIDS { get; set; } - public virtual DbSet<LIQUIDS_RMLS> LIQUIDS_RMLS { get; set; } + public virtual DbSet<LIQUID_TYPES> LIQUID_TYPES { get; set; } + public virtual DbSet<LIQUID_TYPES_RMLS> LIQUID_TYPES_RMLS { get; set; } public virtual DbSet<MACHINE_VERSIONS> MACHINE_VERSIONS { get; set; } public virtual DbSet<MACHINE> MACHINES { get; set; } public virtual DbSet<MACHINES_CONFIGURATIONS> MACHINES_CONFIGURATIONS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index b3b1d2a13..030b534a8 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -5,7 +5,7 @@ <!-- SSDL content --> <edmx:StorageModels> <Schema Namespace="RemoteModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl"> - <EntityType Name="ACTIONS"> + <EntityType Name="ACTION_TYPES"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -176,7 +176,7 @@ <Property Name="VERSION" Type="float" Nullable="false" /> <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> </EntityType> - <EntityType Name="EVENTS"> + <EntityType Name="EVENT_TYPES"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -188,7 +188,7 @@ <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" Nullable="false" /> </EntityType> - <EntityType Name="EVENTS_ACTIONS"> + <EntityType Name="EVENT_TYPES_ACTIONS"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -196,8 +196,8 @@ <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> - <Property Name="EVENT_GUID" Type="varchar" MaxLength="36" Nullable="false" /> - <Property Name="ACTION_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="EVENT_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="ACTION_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> </EntityType> <EntityType Name="FIBER_SHAPES"> <Key> @@ -242,7 +242,7 @@ <Property Name="DELETED" Type="bit" Nullable="false" /> <Property Name="CONFIGURATION_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="DISPENSER_GUID" Type="varchar" MaxLength="36" Nullable="false" /> - <Property Name="LIQUID_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="LIQUID_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="CARTRIDGE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> </EntityType> @@ -257,7 +257,7 @@ <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> <Property Name="CODE" Type="int" Nullable="false" /> </EntityType> - <EntityType Name="LIQUIDS"> + <EntityType Name="LIQUID_TYPES"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -270,7 +270,7 @@ <Property Name="VERSION" Type="float" Nullable="false" /> <Property Name="COLOR" Type="int" Nullable="false" /> </EntityType> - <EntityType Name="LIQUIDS_RMLS"> + <EntityType Name="LIQUID_TYPES_RMLS"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -278,7 +278,7 @@ <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> - <Property Name="LIQUID_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="LIQUID_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" /> </EntityType> <EntityType Name="MACHINE_VERSIONS"> @@ -328,7 +328,7 @@ <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> <Property Name="MACHINE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> - <Property Name="EVENT_GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="EVENT_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="USER_GUID" Type="varchar" MaxLength="36" Nullable="false" /> <Property Name="DATE_TIME" Type="datetime" Nullable="false" /> <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="200" /> @@ -568,14 +568,14 @@ </ReferentialConstraint> </Association> <Association Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS"> - <End Role="LIQUIDS" Type="Self.LIQUIDS" Multiplicity="1" /> + <End Role="LIQUID_TYPES" Type="Self.LIQUID_TYPES" Multiplicity="1" /> <End Role="IDS_PACKS" Type="Self.IDS_PACKS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="LIQUIDS"> + <Principal Role="LIQUID_TYPES"> <PropertyRef Name="GUID" /> </Principal> <Dependent Role="IDS_PACKS"> - <PropertyRef Name="LIQUID_GUID" /> + <PropertyRef Name="LIQUID_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> @@ -628,26 +628,26 @@ </ReferentialConstraint> </Association> <Association Name="FK_EVENTS_ACTIONS_ACTIONS"> - <End Role="ACTIONS" Type="Self.ACTIONS" Multiplicity="1" /> - <End Role="EVENTS_ACTIONS" Type="Self.EVENTS_ACTIONS" Multiplicity="*" /> + <End Role="ACTION_TYPES" Type="Self.ACTION_TYPES" Multiplicity="1" /> + <End Role="EVENT_TYPES_ACTIONS" Type="Self.EVENT_TYPES_ACTIONS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="ACTIONS"> + <Principal Role="ACTION_TYPES"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="EVENTS_ACTIONS"> - <PropertyRef Name="ACTION_GUID" /> + <Dependent Role="EVENT_TYPES_ACTIONS"> + <PropertyRef Name="ACTION_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> <Association Name="FK_EVENTS_ACTIONS_EVENTS"> - <End Role="EVENTS" Type="Self.EVENTS" Multiplicity="1" /> - <End Role="EVENTS_ACTIONS" Type="Self.EVENTS_ACTIONS" Multiplicity="*" /> + <End Role="EVENT_TYPES" Type="Self.EVENT_TYPES" Multiplicity="1" /> + <End Role="EVENT_TYPES_ACTIONS" Type="Self.EVENT_TYPES_ACTIONS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="EVENTS"> + <Principal Role="EVENT_TYPES"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="EVENTS_ACTIONS"> - <PropertyRef Name="EVENT_GUID" /> + <Dependent Role="EVENT_TYPES_ACTIONS"> + <PropertyRef Name="EVENT_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> @@ -664,25 +664,25 @@ </ReferentialConstraint> </Association> <Association Name="FK_LIQUIDS_RML_LIQUIDS"> - <End Role="LIQUIDS" Type="Self.LIQUIDS" Multiplicity="1" /> - <End Role="LIQUIDS_RMLS" Type="Self.LIQUIDS_RMLS" Multiplicity="*" /> + <End Role="LIQUID_TYPES" Type="Self.LIQUID_TYPES" Multiplicity="1" /> + <End Role="LIQUID_TYPES_RMLS" Type="Self.LIQUID_TYPES_RMLS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="LIQUIDS"> + <Principal Role="LIQUID_TYPES"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="LIQUIDS_RMLS"> - <PropertyRef Name="LIQUID_GUID" /> + <Dependent Role="LIQUID_TYPES_RMLS"> + <PropertyRef Name="LIQUID_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> <Association Name="FK_LIQUIDS_RML_RML"> <End Role="RMLS" Type="Self.RMLS" Multiplicity="1" /> - <End Role="LIQUIDS_RMLS" Type="Self.LIQUIDS_RMLS" Multiplicity="*" /> + <End Role="LIQUID_TYPES_RMLS" Type="Self.LIQUID_TYPES_RMLS" Multiplicity="*" /> <ReferentialConstraint> <Principal Role="RMLS"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="LIQUIDS_RMLS"> + <Dependent Role="LIQUID_TYPES_RMLS"> <PropertyRef Name="RML_GUID" /> </Dependent> </ReferentialConstraint> @@ -738,14 +738,14 @@ </ReferentialConstraint> </Association> <Association Name="FK_MACHINES_EVENTS_EVENTS"> - <End Role="EVENTS" Type="Self.EVENTS" Multiplicity="1" /> + <End Role="EVENT_TYPES" Type="Self.EVENT_TYPES" Multiplicity="1" /> <End Role="MACHINES_EVENTS" Type="Self.MACHINES_EVENTS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="EVENTS"> + <Principal Role="EVENT_TYPES"> <PropertyRef Name="GUID" /> </Principal> <Dependent Role="MACHINES_EVENTS"> - <PropertyRef Name="EVENT_GUID" /> + <PropertyRef Name="EVENT_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> @@ -998,7 +998,7 @@ </ReferentialConstraint> </Association> <EntityContainer Name="RemoteModelStoreContainer"> - <EntitySet Name="ACTIONS" EntityType="Self.ACTIONS" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="ACTION_TYPES" EntityType="Self.ACTION_TYPES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="ADDRESSES" EntityType="Self.ADDRESSES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="Self.APPLICATION_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> @@ -1012,15 +1012,15 @@ <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSERS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="Self.EMBEDDED_SOFTWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="EVENTS" EntityType="Self.EVENTS" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="EVENTS_ACTIONS" EntityType="Self.EVENTS_ACTIONS" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="EVENT_TYPES" EntityType="Self.EVENT_TYPES" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="Self.EVENT_TYPES_ACTIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="FIBER_SYNTHS" EntityType="Self.FIBER_SYNTHS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="IDS_PACKS" EntityType="Self.IDS_PACKS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="Self.LINEAR_MASS_DENSITY_UNITS" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="LIQUIDS" EntityType="Self.LIQUIDS" Schema="dbo" store:Type="Tables" /> - <EntitySet Name="LIQUIDS_RMLS" EntityType="Self.LIQUIDS_RMLS" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="LIQUID_TYPES" EntityType="Self.LIQUID_TYPES" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="LIQUID_TYPES_RMLS" EntityType="Self.LIQUID_TYPES_RMLS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="MACHINE_VERSIONS" EntityType="Self.MACHINE_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="MACHINES" EntityType="Self.MACHINES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="MACHINES_CONFIGURATIONS" EntityType="Self.MACHINES_CONFIGURATIONS" Schema="dbo" store:Type="Tables" /> @@ -1066,7 +1066,7 @@ <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> </AssociationSet> <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" Association="Self.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS"> - <End Role="LIQUIDS" EntitySet="LIQUIDS" /> + <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> </AssociationSet> <AssociationSet Name="FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" Association="Self.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS"> @@ -1086,24 +1086,24 @@ <End Role="DISPENSERS" EntitySet="DISPENSERS" /> </AssociationSet> <AssociationSet Name="FK_EVENTS_ACTIONS_ACTIONS" Association="Self.FK_EVENTS_ACTIONS_ACTIONS"> - <End Role="ACTIONS" EntitySet="ACTIONS" /> - <End Role="EVENTS_ACTIONS" EntitySet="EVENTS_ACTIONS" /> + <End Role="ACTION_TYPES" EntitySet="ACTION_TYPES" /> + <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" /> </AssociationSet> <AssociationSet Name="FK_EVENTS_ACTIONS_EVENTS" Association="Self.FK_EVENTS_ACTIONS_EVENTS"> - <End Role="EVENTS" EntitySet="EVENTS" /> - <End Role="EVENTS_ACTIONS" EntitySet="EVENTS_ACTIONS" /> + <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> + <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" /> </AssociationSet> <AssociationSet Name="FK_IDS_PACKS_CONFIGURATIONS" Association="Self.FK_IDS_PACKS_CONFIGURATIONS"> <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> </AssociationSet> <AssociationSet Name="FK_LIQUIDS_RML_LIQUIDS" Association="Self.FK_LIQUIDS_RML_LIQUIDS"> - <End Role="LIQUIDS" EntitySet="LIQUIDS" /> - <End Role="LIQUIDS_RMLS" EntitySet="LIQUIDS_RMLS" /> + <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" /> + <End Role="LIQUID_TYPES_RMLS" EntitySet="LIQUID_TYPES_RMLS" /> </AssociationSet> <AssociationSet Name="FK_LIQUIDS_RML_RML" Association="Self.FK_LIQUIDS_RML_RML"> <End Role="RMLS" EntitySet="RMLS" /> - <End Role="LIQUIDS_RMLS" EntitySet="LIQUIDS_RMLS" /> + <End Role="LIQUID_TYPES_RMLS" EntitySet="LIQUID_TYPES_RMLS" /> </AssociationSet> <AssociationSet Name="FK_MACHINE_VERSIONS_CONFIGURATIONS" Association="Self.FK_MACHINE_VERSIONS_CONFIGURATIONS"> <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" /> @@ -1122,7 +1122,7 @@ <End Role="MACHINES_CONFIGURATIONS" EntitySet="MACHINES_CONFIGURATIONS" /> </AssociationSet> <AssociationSet Name="FK_MACHINES_EVENTS_EVENTS" Association="Self.FK_MACHINES_EVENTS_EVENTS"> - <End Role="EVENTS" EntitySet="EVENTS" /> + <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> <End Role="MACHINES_EVENTS" EntitySet="MACHINES_EVENTS" /> </AssociationSet> <AssociationSet Name="FK_MACHINES_EVENTS_MACHINES" Association="Self.FK_MACHINES_EVENTS_MACHINES"> @@ -1211,7 +1211,7 @@ <edmx:ConceptualModels> <Schema Namespace="RemoteModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm"> <EntityContainer Name="RemoteDB" annotation:LazyLoadingEnabled="true"> - <EntitySet Name="ACTIONS" EntityType="RemoteModel.ACTION" /> + <EntitySet Name="ACTION_TYPES" EntityType="RemoteModel.ACTION_TYPES" /> <EntitySet Name="ADDRESSES" EntityType="RemoteModel.ADDRESS" /> <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" /> <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" /> @@ -1225,15 +1225,15 @@ <EntitySet Name="DISPENSERS" EntityType="RemoteModel.DISPENSER" /> <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" /> <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" /> - <EntitySet Name="EVENTS" EntityType="RemoteModel.EVENT" /> - <EntitySet Name="EVENTS_ACTIONS" EntityType="RemoteModel.EVENTS_ACTIONS" /> + <EntitySet Name="EVENT_TYPES" EntityType="RemoteModel.EVENT_TYPES" /> + <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="RemoteModel.EVENT_TYPES_ACTIONS" /> <EntitySet Name="FIBER_SHAPES" EntityType="RemoteModel.FIBER_SHAPES" /> <EntitySet Name="FIBER_SYNTHS" EntityType="RemoteModel.FIBER_SYNTHS" /> <EntitySet Name="HARDWARE_VERSIONS" EntityType="RemoteModel.HARDWARE_VERSIONS" /> <EntitySet Name="IDS_PACKS" EntityType="RemoteModel.IDS_PACKS" /> <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" /> - <EntitySet Name="LIQUIDS" EntityType="RemoteModel.LIQUID" /> - <EntitySet Name="LIQUIDS_RMLS" EntityType="RemoteModel.LIQUIDS_RMLS" /> + <EntitySet Name="LIQUID_TYPES" EntityType="RemoteModel.LIQUID_TYPES" /> + <EntitySet Name="LIQUID_TYPES_RMLS" EntityType="RemoteModel.LIQUID_TYPES_RMLS" /> <EntitySet Name="MACHINE_VERSIONS" EntityType="RemoteModel.MACHINE_VERSIONS" /> <EntitySet Name="MACHINES" EntityType="RemoteModel.MACHINE" /> <EntitySet Name="MACHINES_CONFIGURATIONS" EntityType="RemoteModel.MACHINES_CONFIGURATIONS" /> @@ -1251,8 +1251,8 @@ <EntitySet Name="USERS" EntityType="RemoteModel.USER" /> <EntitySet Name="USERS_ROLES" EntityType="RemoteModel.USERS_ROLES" /> <AssociationSet Name="FK_EVENTS_ACTIONS_ACTIONS" Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS"> - <End Role="ACTION" EntitySet="ACTIONS" /> - <End Role="EVENTS_ACTIONS" EntitySet="EVENTS_ACTIONS" /> + <End Role="ACTION_TYPES" EntitySet="ACTION_TYPES" /> + <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" /> </AssociationSet> <AssociationSet Name="FK_ORGANIZATIONS_ADDRESSES" Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES"> <End Role="ADDRESS" EntitySet="ADDRESSES" /> @@ -1331,11 +1331,11 @@ <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> </AssociationSet> <AssociationSet Name="FK_EVENTS_ACTIONS_EVENTS" Association="RemoteModel.FK_EVENTS_ACTIONS_EVENTS"> - <End Role="EVENT" EntitySet="EVENTS" /> - <End Role="EVENTS_ACTIONS" EntitySet="EVENTS_ACTIONS" /> + <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> + <End Role="EVENT_TYPES_ACTIONS" EntitySet="EVENT_TYPES_ACTIONS" /> </AssociationSet> <AssociationSet Name="FK_MACHINES_EVENTS_EVENTS" Association="RemoteModel.FK_MACHINES_EVENTS_EVENTS"> - <End Role="EVENT" EntitySet="EVENTS" /> + <End Role="EVENT_TYPES" EntitySet="EVENT_TYPES" /> <End Role="MACHINES_EVENTS" EntitySet="MACHINES_EVENTS" /> </AssociationSet> <AssociationSet Name="FK_RML_FIBER_SHAPES" Association="RemoteModel.FK_RML_FIBER_SHAPES"> @@ -1347,7 +1347,7 @@ <End Role="RML" EntitySet="RMLS" /> </AssociationSet> <AssociationSet Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS"> - <End Role="LIQUID" EntitySet="LIQUIDS" /> + <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> </AssociationSet> <AssociationSet Name="FK_RML_LINEAR_MASS_DENSITY_UNITS" Association="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS"> @@ -1355,12 +1355,12 @@ <End Role="RML" EntitySet="RMLS" /> </AssociationSet> <AssociationSet Name="FK_LIQUIDS_RML_LIQUIDS" Association="RemoteModel.FK_LIQUIDS_RML_LIQUIDS"> - <End Role="LIQUID" EntitySet="LIQUIDS" /> - <End Role="LIQUIDS_RMLS" EntitySet="LIQUIDS_RMLS" /> + <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" /> + <End Role="LIQUID_TYPES_RMLS" EntitySet="LIQUID_TYPES_RMLS" /> </AssociationSet> <AssociationSet Name="FK_LIQUIDS_RML_RML" Association="RemoteModel.FK_LIQUIDS_RML_RML"> <End Role="RML" EntitySet="RMLS" /> - <End Role="LIQUIDS_RMLS" EntitySet="LIQUIDS_RMLS" /> + <End Role="LIQUID_TYPES_RMLS" EntitySet="LIQUID_TYPES_RMLS" /> </AssociationSet> <AssociationSet Name="FK_MACHINES_MACHINE_VERSIONS" Association="RemoteModel.FK_MACHINES_MACHINE_VERSIONS"> <End Role="MACHINE_VERSIONS" EntitySet="MACHINE_VERSIONS" /> @@ -1419,7 +1419,7 @@ <End Role="USERS_ROLES" EntitySet="USERS_ROLES" /> </AssociationSet> </EntityContainer> - <EntityType Name="ACTION"> + <EntityType Name="ACTION_TYPES"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -1430,7 +1430,7 @@ <Property Name="CODE" Type="Int32" Nullable="false" /> <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" /> - <NavigationProperty Name="EVENTS_ACTIONS" Relationship="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" FromRole="ACTION" ToRole="EVENTS_ACTIONS" /> + <NavigationProperty Name="EVENT_TYPES_ACTIONS" Relationship="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" FromRole="ACTION_TYPES" ToRole="EVENT_TYPES_ACTIONS" /> </EntityType> <EntityType Name="ADDRESS"> <Key> @@ -1618,7 +1618,7 @@ <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> <NavigationProperty Name="CONFIGURATIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_SOFTWARE_VERSIONS" FromRole="EMBEDDED_SOFTWARE_VERSIONS" ToRole="CONFIGURATION" /> </EntityType> - <EntityType Name="EVENT"> + <EntityType Name="EVENT_TYPES"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -1629,10 +1629,10 @@ <Property Name="CODE" Type="Int32" Nullable="false" /> <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" /> - <NavigationProperty Name="EVENTS_ACTIONS" Relationship="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" FromRole="EVENT" ToRole="EVENTS_ACTIONS" /> - <NavigationProperty Name="MACHINES_EVENTS" Relationship="RemoteModel.FK_MACHINES_EVENTS_EVENTS" FromRole="EVENT" ToRole="MACHINES_EVENTS" /> + <NavigationProperty Name="EVENT_TYPES_ACTIONS" Relationship="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" FromRole="EVENT_TYPES" ToRole="EVENT_TYPES_ACTIONS" /> + <NavigationProperty Name="MACHINES_EVENTS" Relationship="RemoteModel.FK_MACHINES_EVENTS_EVENTS" FromRole="EVENT_TYPES" ToRole="MACHINES_EVENTS" /> </EntityType> - <EntityType Name="EVENTS_ACTIONS"> + <EntityType Name="EVENT_TYPES_ACTIONS"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -1640,10 +1640,10 @@ <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> - <Property Name="EVENT_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="ACTION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <NavigationProperty Name="ACTION" Relationship="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" FromRole="EVENTS_ACTIONS" ToRole="ACTION" /> - <NavigationProperty Name="EVENT" Relationship="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" FromRole="EVENTS_ACTIONS" ToRole="EVENT" /> + <Property Name="EVENT_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="ACTION_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="ACTION_TYPES" Relationship="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" FromRole="EVENT_TYPES_ACTIONS" ToRole="ACTION_TYPES" /> + <NavigationProperty Name="EVENT_TYPES" Relationship="RemoteModel.FK_EVENTS_ACTIONS_EVENTS" FromRole="EVENT_TYPES_ACTIONS" ToRole="EVENT_TYPES" /> </EntityType> <EntityType Name="FIBER_SHAPES"> <Key> @@ -1691,13 +1691,13 @@ <Property Name="DELETED" Type="Boolean" Nullable="false" /> <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="CARTRIDGE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> <NavigationProperty Name="CARTRIDGE" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES" FromRole="IDS_PACKS" ToRole="CARTRIDGE" /> <NavigationProperty Name="CONFIGURATION" Relationship="RemoteModel.FK_IDS_PACKS_CONFIGURATIONS" FromRole="IDS_PACKS" ToRole="CONFIGURATION" /> <NavigationProperty Name="DISPENSER" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_DISPENSERS" FromRole="IDS_PACKS" ToRole="DISPENSER" /> - <NavigationProperty Name="LIQUID" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="IDS_PACKS" ToRole="LIQUID" /> + <NavigationProperty Name="LIQUID_TYPES" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="IDS_PACKS" ToRole="LIQUID_TYPES" /> </EntityType> <EntityType Name="LINEAR_MASS_DENSITY_UNITS"> <Key> @@ -1711,7 +1711,7 @@ <Property Name="CODE" Type="Int32" Nullable="false" /> <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS" FromRole="LINEAR_MASS_DENSITY_UNITS" ToRole="RML" /> </EntityType> - <EntityType Name="LIQUID"> + <EntityType Name="LIQUID_TYPES"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -1723,10 +1723,10 @@ <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> <Property Name="VERSION" Type="Double" Nullable="false" /> <Property Name="COLOR" Type="Int32" Nullable="false" /> - <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="LIQUID" ToRole="IDS_PACKS" /> - <NavigationProperty Name="LIQUIDS_RMLS" Relationship="RemoteModel.FK_LIQUIDS_RML_LIQUIDS" FromRole="LIQUID" ToRole="LIQUIDS_RMLS" /> + <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="LIQUID_TYPES" ToRole="IDS_PACKS" /> + <NavigationProperty Name="LIQUID_TYPES_RMLS" Relationship="RemoteModel.FK_LIQUIDS_RML_LIQUIDS" FromRole="LIQUID_TYPES" ToRole="LIQUID_TYPES_RMLS" /> </EntityType> - <EntityType Name="LIQUIDS_RMLS"> + <EntityType Name="LIQUID_TYPES_RMLS"> <Key> <PropertyRef Name="GUID" /> </Key> @@ -1734,10 +1734,10 @@ <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> - <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <NavigationProperty Name="LIQUID" Relationship="RemoteModel.FK_LIQUIDS_RML_LIQUIDS" FromRole="LIQUIDS_RMLS" ToRole="LIQUID" /> - <NavigationProperty Name="RML" Relationship="RemoteModel.FK_LIQUIDS_RML_RML" FromRole="LIQUIDS_RMLS" ToRole="RML" /> + <NavigationProperty Name="LIQUID_TYPES" Relationship="RemoteModel.FK_LIQUIDS_RML_LIQUIDS" FromRole="LIQUID_TYPES_RMLS" ToRole="LIQUID_TYPES" /> + <NavigationProperty Name="RML" Relationship="RemoteModel.FK_LIQUIDS_RML_RML" FromRole="LIQUID_TYPES_RMLS" ToRole="RML" /> </EntityType> <EntityType Name="MACHINE_VERSIONS"> <Key> @@ -1795,11 +1795,11 @@ <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> - <Property Name="EVENT_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="EVENT_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="USER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="DATE_TIME" Type="DateTime" Nullable="false" Precision="3" /> <Property Name="DESCRIPTION" Type="String" MaxLength="200" FixedLength="false" Unicode="true" /> - <NavigationProperty Name="EVENT" Relationship="RemoteModel.FK_MACHINES_EVENTS_EVENTS" FromRole="MACHINES_EVENTS" ToRole="EVENT" /> + <NavigationProperty Name="EVENT_TYPES" Relationship="RemoteModel.FK_MACHINES_EVENTS_EVENTS" FromRole="MACHINES_EVENTS" ToRole="EVENT_TYPES" /> <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_MACHINES_EVENTS_MACHINES" FromRole="MACHINES_EVENTS" ToRole="MACHINE" /> <NavigationProperty Name="USER" Relationship="RemoteModel.FK_MACHINES_EVENTS_USERS" FromRole="MACHINES_EVENTS" ToRole="USER" /> </EntityType> @@ -1908,7 +1908,7 @@ <NavigationProperty Name="FIBER_SHAPES" Relationship="RemoteModel.FK_RML_FIBER_SHAPES" FromRole="RML" ToRole="FIBER_SHAPES" /> <NavigationProperty Name="FIBER_SYNTHS" Relationship="RemoteModel.FK_RML_FIBER_SYNTHESIS" FromRole="RML" ToRole="FIBER_SYNTHS" /> <NavigationProperty Name="LINEAR_MASS_DENSITY_UNITS" Relationship="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS" FromRole="RML" ToRole="LINEAR_MASS_DENSITY_UNITS" /> - <NavigationProperty Name="LIQUIDS_RMLS" Relationship="RemoteModel.FK_LIQUIDS_RML_RML" FromRole="RML" ToRole="LIQUIDS_RMLS" /> + <NavigationProperty Name="LIQUID_TYPES_RMLS" Relationship="RemoteModel.FK_LIQUIDS_RML_RML" FromRole="RML" ToRole="LIQUID_TYPES_RMLS" /> <NavigationProperty Name="MEDIA_COLORS" Relationship="RemoteModel.FK_RML_MEDIA_COLORS" FromRole="RML" ToRole="MEDIA_COLORS" /> <NavigationProperty Name="MEDIA_CONDITIONS" Relationship="RemoteModel.FK_RML_MEDIA_CONDITIONS" FromRole="RML" ToRole="MEDIA_CONDITIONS" /> <NavigationProperty Name="MEDIA_MATERIALS" Relationship="RemoteModel.FK_RML_MEDIA_MATERIALS" FromRole="RML" ToRole="MEDIA_MATERIALS" /> @@ -1982,14 +1982,14 @@ <NavigationProperty Name="USER" Relationship="RemoteModel.FK_USERS_ROLES_USERS" FromRole="USERS_ROLES" ToRole="USER" /> </EntityType> <Association Name="FK_EVENTS_ACTIONS_ACTIONS"> - <End Type="RemoteModel.ACTION" Role="ACTION" Multiplicity="1" /> - <End Type="RemoteModel.EVENTS_ACTIONS" Role="EVENTS_ACTIONS" Multiplicity="*" /> + <End Type="RemoteModel.ACTION_TYPES" Role="ACTION_TYPES" Multiplicity="1" /> + <End Type="RemoteModel.EVENT_TYPES_ACTIONS" Role="EVENT_TYPES_ACTIONS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="ACTION"> + <Principal Role="ACTION_TYPES"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="EVENTS_ACTIONS"> - <PropertyRef Name="ACTION_GUID" /> + <Dependent Role="EVENT_TYPES_ACTIONS"> + <PropertyRef Name="ACTION_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> @@ -2226,26 +2226,26 @@ </ReferentialConstraint> </Association> <Association Name="FK_EVENTS_ACTIONS_EVENTS"> - <End Type="RemoteModel.EVENT" Role="EVENT" Multiplicity="1" /> - <End Type="RemoteModel.EVENTS_ACTIONS" Role="EVENTS_ACTIONS" Multiplicity="*" /> + <End Type="RemoteModel.EVENT_TYPES" Role="EVENT_TYPES" Multiplicity="1" /> + <End Type="RemoteModel.EVENT_TYPES_ACTIONS" Role="EVENT_TYPES_ACTIONS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="EVENT"> + <Principal Role="EVENT_TYPES"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="EVENTS_ACTIONS"> - <PropertyRef Name="EVENT_GUID" /> + <Dependent Role="EVENT_TYPES_ACTIONS"> + <PropertyRef Name="EVENT_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> <Association Name="FK_MACHINES_EVENTS_EVENTS"> - <End Type="RemoteModel.EVENT" Role="EVENT" Multiplicity="1" /> + <End Type="RemoteModel.EVENT_TYPES" Role="EVENT_TYPES" Multiplicity="1" /> <End Type="RemoteModel.MACHINES_EVENTS" Role="MACHINES_EVENTS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="EVENT"> + <Principal Role="EVENT_TYPES"> <PropertyRef Name="GUID" /> </Principal> <Dependent Role="MACHINES_EVENTS"> - <PropertyRef Name="EVENT_GUID" /> + <PropertyRef Name="EVENT_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> @@ -2274,14 +2274,14 @@ </ReferentialConstraint> </Association> <Association Name="FK_CONFIGURATIONS_DISPENSERS_LIQUIDS"> - <End Type="RemoteModel.LIQUID" Role="LIQUID" Multiplicity="1" /> + <End Type="RemoteModel.LIQUID_TYPES" Role="LIQUID_TYPES" Multiplicity="1" /> <End Type="RemoteModel.IDS_PACKS" Role="IDS_PACKS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="LIQUID"> + <Principal Role="LIQUID_TYPES"> <PropertyRef Name="GUID" /> </Principal> <Dependent Role="IDS_PACKS"> - <PropertyRef Name="LIQUID_GUID" /> + <PropertyRef Name="LIQUID_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> @@ -2298,25 +2298,25 @@ </ReferentialConstraint> </Association> <Association Name="FK_LIQUIDS_RML_LIQUIDS"> - <End Type="RemoteModel.LIQUID" Role="LIQUID" Multiplicity="1" /> - <End Type="RemoteModel.LIQUIDS_RMLS" Role="LIQUIDS_RMLS" Multiplicity="*" /> + <End Type="RemoteModel.LIQUID_TYPES" Role="LIQUID_TYPES" Multiplicity="1" /> + <End Type="RemoteModel.LIQUID_TYPES_RMLS" Role="LIQUID_TYPES_RMLS" Multiplicity="*" /> <ReferentialConstraint> - <Principal Role="LIQUID"> + <Principal Role="LIQUID_TYPES"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="LIQUIDS_RMLS"> - <PropertyRef Name="LIQUID_GUID" /> + <Dependent Role="LIQUID_TYPES_RMLS"> + <PropertyRef Name="LIQUID_TYPE_GUID" /> </Dependent> </ReferentialConstraint> </Association> <Association Name="FK_LIQUIDS_RML_RML"> <End Type="RemoteModel.RML" Role="RML" Multiplicity="1" /> - <End Type="RemoteModel.LIQUIDS_RMLS" Role="LIQUIDS_RMLS" Multiplicity="*" /> + <End Type="RemoteModel.LIQUID_TYPES_RMLS" Role="LIQUID_TYPES_RMLS" Multiplicity="*" /> <ReferentialConstraint> <Principal Role="RML"> <PropertyRef Name="GUID" /> </Principal> - <Dependent Role="LIQUIDS_RMLS"> + <Dependent Role="LIQUID_TYPES_RMLS"> <PropertyRef Name="RML_GUID" /> </Dependent> </ReferentialConstraint> @@ -2501,9 +2501,9 @@ <edmx:Mappings> <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs"> <EntityContainerMapping StorageEntityContainer="RemoteModelStoreContainer" CdmEntityContainer="RemoteDB"> - <EntitySetMapping Name="ACTIONS"> - <EntityTypeMapping TypeName="RemoteModel.ACTION"> - <MappingFragment StoreEntitySet="ACTIONS"> + <EntitySetMapping Name="ACTION_TYPES"> + <EntityTypeMapping TypeName="RemoteModel.ACTION_TYPES"> + <MappingFragment StoreEntitySet="ACTION_TYPES"> <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> <ScalarProperty Name="NAME" ColumnName="NAME" /> <ScalarProperty Name="CODE" ColumnName="CODE" /> @@ -2686,9 +2686,9 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="EVENTS"> - <EntityTypeMapping TypeName="RemoteModel.EVENT"> - <MappingFragment StoreEntitySet="EVENTS"> + <EntitySetMapping Name="EVENT_TYPES"> + <EntityTypeMapping TypeName="RemoteModel.EVENT_TYPES"> + <MappingFragment StoreEntitySet="EVENT_TYPES"> <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> <ScalarProperty Name="NAME" ColumnName="NAME" /> <ScalarProperty Name="CODE" ColumnName="CODE" /> @@ -2699,11 +2699,11 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="EVENTS_ACTIONS"> - <EntityTypeMapping TypeName="RemoteModel.EVENTS_ACTIONS"> - <MappingFragment StoreEntitySet="EVENTS_ACTIONS"> - <ScalarProperty Name="ACTION_GUID" ColumnName="ACTION_GUID" /> - <ScalarProperty Name="EVENT_GUID" ColumnName="EVENT_GUID" /> + <EntitySetMapping Name="EVENT_TYPES_ACTIONS"> + <EntityTypeMapping TypeName="RemoteModel.EVENT_TYPES_ACTIONS"> + <MappingFragment StoreEntitySet="EVENT_TYPES_ACTIONS"> + <ScalarProperty Name="ACTION_TYPE_GUID" ColumnName="ACTION_TYPE_GUID" /> + <ScalarProperty Name="EVENT_TYPE_GUID" ColumnName="EVENT_TYPE_GUID" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> <ScalarProperty Name="GUID" ColumnName="GUID" /> @@ -2752,7 +2752,7 @@ <MappingFragment StoreEntitySet="IDS_PACKS"> <ScalarProperty Name="NAME" ColumnName="NAME" /> <ScalarProperty Name="CARTRIDGE_GUID" ColumnName="CARTRIDGE_GUID" /> - <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" /> + <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" /> <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" /> <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> @@ -2774,9 +2774,9 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="LIQUIDS"> - <EntityTypeMapping TypeName="RemoteModel.LIQUID"> - <MappingFragment StoreEntitySet="LIQUIDS"> + <EntitySetMapping Name="LIQUID_TYPES"> + <EntityTypeMapping TypeName="RemoteModel.LIQUID_TYPES"> + <MappingFragment StoreEntitySet="LIQUID_TYPES"> <ScalarProperty Name="COLOR" ColumnName="COLOR" /> <ScalarProperty Name="VERSION" ColumnName="VERSION" /> <ScalarProperty Name="NAME" ColumnName="NAME" /> @@ -2788,11 +2788,11 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> - <EntitySetMapping Name="LIQUIDS_RMLS"> - <EntityTypeMapping TypeName="RemoteModel.LIQUIDS_RMLS"> - <MappingFragment StoreEntitySet="LIQUIDS_RMLS"> + <EntitySetMapping Name="LIQUID_TYPES_RMLS"> + <EntityTypeMapping TypeName="RemoteModel.LIQUID_TYPES_RMLS"> + <MappingFragment StoreEntitySet="LIQUID_TYPES_RMLS"> <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" /> - <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" /> + <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> <ScalarProperty Name="GUID" ColumnName="GUID" /> @@ -2847,7 +2847,7 @@ <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> <ScalarProperty Name="DATE_TIME" ColumnName="DATE_TIME" /> <ScalarProperty Name="USER_GUID" ColumnName="USER_GUID" /> - <ScalarProperty Name="EVENT_GUID" ColumnName="EVENT_GUID" /> + <ScalarProperty Name="EVENT_TYPE_GUID" ColumnName="EVENT_TYPE_GUID" /> <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index d3354710d..ff3da16b4 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,45 +5,45 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1"> - <EntityTypeShape EntityType="RemoteModel.ACTION" Width="1.5" PointX="12.5" PointY="39.75" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3" PointY="23" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="16.625" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="29" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="26" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="13.5" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="0.75" PointY="6" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE" Width="1.5" PointX="3" PointY="3.625" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="7.5" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3" PointY="19" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="32.625" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="32.625" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="22.875" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="19.75" /> - <EntityTypeShape EntityType="RemoteModel.EVENT" Width="1.5" PointX="7.5" PointY="19.625" /> - <EntityTypeShape EntityType="RemoteModel.EVENTS_ACTIONS" Width="1.5" PointX="14.75" PointY="19.75" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="11.75" PointY="17.25" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="11.75" PointY="32.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="9.125" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="8.625" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="11.75" PointY="26.5" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID" Width="1.5" PointX="3" PointY="14.875" /> - <EntityTypeShape EntityType="RemoteModel.LIQUIDS_RMLS" Width="1.5" PointX="16.25" PointY="10" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="5.25" PointY="13.25" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="7.5" PointY="9.875" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="9.75" PointY="9.375" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="9.75" PointY="13.125" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="11.75" PointY="7" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="11.75" PointY="20.375" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="11.75" PointY="29.625" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="11.75" PointY="23.5" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="5.25" PointY="21.25" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="10.5" PointY="36.375" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="14" PointY="4.75" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="10.5" PointY="2.625" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="12.75" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="5.75" PointY="4.25" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="7.5" PointY="15.125" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="12.75" PointY="13.75" /> + <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="15.5" PointY="20.375" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3" PointY="15.125" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="20" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="16.875" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="10.625" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="6.375" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="0.75" PointY="29.5" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE" Width="1.5" PointX="3" PointY="29.5" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="4.75" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3" PointY="19.375" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="32.875" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="32.75" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="26.25" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="13.75" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="7.5" PointY="12.375" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="17.75" PointY="12.375" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="11.75" PointY="23.5" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="11.75" PointY="14.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="23.125" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="5.75" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="11.75" PointY="26.625" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="16.25" PointY="3.375" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="5.25" PointY="10.375" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="7.5" PointY="7" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="9.75" PointY="6.5" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="9.75" PointY="10.25" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="11.75" PointY="20.625" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="11.75" PointY="29.75" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="11.75" PointY="17.5" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="11.75" PointY="4.125" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="5.25" PointY="17.375" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12.5" PointY="33.375" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="14" PointY="1.875" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12.5" PointY="10.375" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.75" PointY="10.375" /> + <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="5.75" PointY="1.5" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="7.5" PointY="15.875" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.75" PointY="16.375" /> <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index a1241d0bc..24b595544 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -65,7 +65,7 @@ <Compile Include="..\Versioning\GlobalVersionInfo.cs"> <Link>GlobalVersionInfo.cs</Link> </Compile> - <Compile Include="DB\ACTION.cs"> + <Compile Include="DB\ACTION_TYPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> <Compile Include="DB\ADDRESS.cs"> @@ -107,10 +107,10 @@ <Compile Include="DB\EMBEDDED_SOFTWARE_VERSIONS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> - <Compile Include="DB\EVENT.cs"> + <Compile Include="DB\EVENT_TYPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> - <Compile Include="DB\EVENTS_ACTIONS.cs"> + <Compile Include="DB\EVENT_TYPES_ACTIONS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> <Compile Include="DB\FIBER_SHAPES.cs"> @@ -128,10 +128,10 @@ <Compile Include="DB\LINEAR_MASS_DENSITY_UNITS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> - <Compile Include="DB\LIQUID.cs"> + <Compile Include="DB\LIQUID_TYPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> - <Compile Include="DB\LIQUIDS_RMLS.cs"> + <Compile Include="DB\LIQUID_TYPES_RMLS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> <Compile Include="DB\MACHINE.cs"> |