From fee2c690e1ff0b8be3a3f10e30184c76efa4c0c2 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 19 Dec 2017 14:53:03 +0200 Subject: Modified several table names. --- .../java/com/twine/tango/dal/dao/TangoDAO.java | 50 ++-- .../java/com/twine/tango/dal/entities/Action.java | 94 -------- .../com/twine/tango/dal/entities/ActionType.java | 94 ++++++++ .../java/com/twine/tango/dal/entities/Event.java | 94 -------- .../com/twine/tango/dal/entities/EventType.java | 94 ++++++++ .../twine/tango/dal/entities/EventTypesAction.java | 68 ++++++ .../com/twine/tango/dal/entities/EventsAction.java | 68 ------ .../java/com/twine/tango/dal/entities/IdsPack.java | 20 +- .../java/com/twine/tango/dal/entities/Liquid.java | 120 ---------- .../com/twine/tango/dal/entities/LiquidType.java | 120 ++++++++++ .../twine/tango/dal/entities/LiquidTypesRml.java | 68 ++++++ .../com/twine/tango/dal/entities/LiquidsRml.java | 68 ------ .../java/com/twine/tango/dal/entities/Machine.java | 26 +++ .../twine/tango/dal/entities/MachinesEvent.java | 20 +- .../Tango.DAL/src/main/res/raw/tangodb | Bin 557056 -> 557056 bytes Software/DB/Tango.db | Bin 557056 -> 557056 bytes Software/DB/Tango.db-journal | Bin 234440 -> 0 bytes Software/DB/Tango.mdf | Bin 8388608 -> 8388608 bytes Software/DB/Tango_log.ldf | Bin 8388608 -> 8388608 bytes .../Tango.MachineStudio.DB.csproj | 16 +- .../Tango.MachineStudio.DB/ViewModelLocator.cs | 14 +- .../ViewModels/ActionsTypesViewVM.cs | 18 ++ .../ViewModels/EventTypesViewVM.cs | 17 ++ .../ViewModels/LiquidTypesViewVM.cs | 17 ++ .../ViewModels/LiquidsViewVM.cs | 17 -- .../Views/DBViews/IdsPackView.xaml | 4 +- .../Views/DBViews/IdsPacksView.xaml | 6 +- .../Views/DBViews/LiquidTypeView.xaml | 42 ++++ .../Views/DBViews/LiquidTypeView.xaml.cs | 28 +++ .../Views/DBViews/LiquidTypesView.xaml | 41 ++++ .../Views/DBViews/LiquidTypesView.xaml.cs | 32 +++ .../Views/DBViews/LiquidView.xaml | 42 ---- .../Views/DBViews/LiquidView.xaml.cs | 28 --- .../Views/DBViews/LiquidsView.xaml | 41 ---- .../Views/DBViews/LiquidsView.xaml.cs | 32 --- .../Visual_Studio/Tango.DAL.Local/DB/ACTION.cs | 25 -- .../Tango.DAL.Local/DB/ACTION_TYPES.cs | 25 ++ Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs | 24 -- .../Tango.DAL.Local/DB/EVENTS_ACTIONS.cs | 24 -- .../Tango.DAL.Local/DB/EVENT_TYPES.cs | 24 ++ .../Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs | 24 ++ .../Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs | 2 +- .../Visual_Studio/Tango.DAL.Local/DB/LIQUID.cs | 25 -- .../Tango.DAL.Local/DB/LIQUIDS_RMLS.cs | 24 -- .../Tango.DAL.Local/DB/LIQUID_TYPES.cs | 25 ++ .../Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs | 24 ++ .../Tango.DAL.Local/DB/LocalADO.Context.cs | 10 +- .../Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx | 103 +++++---- .../Tango.DAL.Local/DB/LocalADO.edmx.diagram | 10 +- .../Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs | 1 + .../Tango.DAL.Local/DB/MACHINES_EVENTS.cs | 2 +- .../Tango.DAL.Local/Tango.DAL.Local.csproj | 10 +- .../Tango.DAL.Observables/Entities/Action.cs | 117 ---------- .../Tango.DAL.Observables/Entities/ActionType.cs | 117 ++++++++++ .../Tango.DAL.Observables/Entities/Event.cs | 138 ----------- .../Tango.DAL.Observables/Entities/EventType.cs | 138 +++++++++++ .../Entities/EventTypesAction.cs | 114 ++++++++++ .../Tango.DAL.Observables/Entities/EventsAction.cs | 114 ---------- .../Tango.DAL.Observables/Entities/IdsPack.cs | 24 +- .../Tango.DAL.Observables/Entities/Liquid.cs | 157 ------------- .../Tango.DAL.Observables/Entities/LiquidType.cs | 157 +++++++++++++ .../Entities/LiquidTypesRml.cs | 114 ++++++++++ .../Tango.DAL.Observables/Entities/LiquidsRml.cs | 114 ---------- .../Entities/MachinesEvent.cs | 24 +- .../Tango.DAL.Observables/Entities/Rml.cs | 14 +- .../Enumerations/ActionTypes.cs | 12 + .../Enumerations/EventTypes.cs | 12 + .../Enumerations/LiquidTypes.cs | 25 ++ .../ObservablesEntitiesAdapter.cs | 2 +- .../ObservablesEntitiesAdapterExtension.cs | 110 ++++----- .../Tango.DAL.Observables.csproj | 10 +- .../Visual_Studio/Tango.DAL.Remote/DB/ACTION.cs | 34 --- .../Tango.DAL.Remote/DB/ACTION_TYPES.cs | 34 +++ .../Visual_Studio/Tango.DAL.Remote/DB/EVENT.cs | 37 --- .../Tango.DAL.Remote/DB/EVENTS_ACTIONS.cs | 27 --- .../Tango.DAL.Remote/DB/EVENT_TYPES.cs | 37 +++ .../Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs | 27 +++ .../Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs | 4 +- .../Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs | 38 ---- .../Tango.DAL.Remote/DB/LIQUIDS_RMLS.cs | 27 --- .../Tango.DAL.Remote/DB/LIQUID_TYPES.cs | 38 ++++ .../Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs | 27 +++ .../Tango.DAL.Remote/DB/MACHINES_EVENTS.cs | 4 +- Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs | 4 +- .../Tango.DAL.Remote/DB/RemoteADO.Context.cs | 10 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx | 252 ++++++++++----------- .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 78 +++---- .../Tango.DAL.Remote/Tango.DAL.Remote.csproj | 10 +- 88 files changed, 2053 insertions(+), 1929 deletions(-) delete mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Action.java create mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java delete mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Event.java create mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java create mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java delete mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventsAction.java delete mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Liquid.java create mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java create mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java delete mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidsRml.java delete mode 100644 Software/DB/Tango.db-journal create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionsTypesViewVM.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidsViewVM.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidsView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidsView.xaml.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/ACTION.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/EVENTS_ACTIONS.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/LIQUIDS_RMLS.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Action.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/ActionType.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Event.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/EventType.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/EventTypesAction.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/EventsAction.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Liquid.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidsRml.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ActionTypes.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/EventTypes.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LiquidTypes.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/EVENTS_ACTIONS.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUIDS_RMLS.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs 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 getAllActions() + public static List 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 getAllEvents() + public static List 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 getAllEventsActions() + public static List 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 getAllLiquids() + public static List 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 getAllLiquidsRmls() + public static List 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/Action.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Action.java deleted file mode 100644 index ac0cb892f..000000000 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Action.java +++ /dev/null @@ -1,94 +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 = "ACTIONS", database = TangoDB.class) - public class Action extends Entity - { - - @Column(name = "CODE") - private int code; - - - - @Column(name = "NAME") - private String name; - - - - @Column(name = "DESCRIPTION") - private String description; - - - - - /** - * Gets the Code. - * - * return the Code - */ - public int getCode() - { - return code; - } - - /** - * Sets the Code. - * - * @param code the Code - */ - public void setCode(int code) - { - this.code = code; - } - - - /** - * Gets the Name. - * - * return the Name - */ - public String getName() - { - return name; - } - - /** - * Sets the Name. - * - * @param name the Name - */ - public void setName(String name) - { - this.name = name; - } - - - /** - * Gets the Description. - * - * return the Description - */ - public String getDescription() - { - return description; - } - - /** - * Sets the Description. - * - * @param description the Description - */ - public void setDescription(String description) - { - this.description = description; - } - - } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java new file mode 100644 index 000000000..adf82e056 --- /dev/null +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java @@ -0,0 +1,94 @@ +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 = "ACTION_TYPES", database = TangoDB.class) + public class ActionType extends Entity + { + + @Column(name = "CODE") + private int code; + + + + @Column(name = "NAME") + private String name; + + + + @Column(name = "DESCRIPTION") + private String description; + + + + + /** + * Gets the Code. + * + * return the Code + */ + public int getCode() + { + return code; + } + + /** + * Sets the Code. + * + * @param code the Code + */ + public void setCode(int code) + { + this.code = code; + } + + + /** + * Gets the Name. + * + * return the Name + */ + public String getName() + { + return name; + } + + /** + * Sets the Name. + * + * @param name the Name + */ + public void setName(String name) + { + this.name = name; + } + + + /** + * Gets the Description. + * + * return the Description + */ + public String getDescription() + { + return description; + } + + /** + * Sets the Description. + * + * @param description the Description + */ + public void setDescription(String description) + { + this.description = description; + } + + } 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/Event.java deleted file mode 100644 index e6c5b562b..000000000 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Event.java +++ /dev/null @@ -1,94 +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", database = TangoDB.class) - public class Event extends Entity - { - - @Column(name = "CODE") - private int code; - - - - @Column(name = "NAME") - private String name; - - - - @Column(name = "DESCRIPTION") - private String description; - - - - - /** - * Gets the Code. - * - * return the Code - */ - public int getCode() - { - return code; - } - - /** - * Sets the Code. - * - * @param code the Code - */ - public void setCode(int code) - { - this.code = code; - } - - - /** - * Gets the Name. - * - * return the Name - */ - public String getName() - { - return name; - } - - /** - * Sets the Name. - * - * @param name the Name - */ - public void setName(String name) - { - this.name = name; - } - - - /** - * Gets the Description. - * - * return the Description - */ - public String getDescription() - { - return description; - } - - /** - * Sets the Description. - * - * @param description the Description - */ - public void setDescription(String description) - { - this.description = description; - } - - } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java new file mode 100644 index 000000000..9340b78c3 --- /dev/null +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java @@ -0,0 +1,94 @@ +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", database = TangoDB.class) + public class EventType extends Entity + { + + @Column(name = "CODE") + private int code; + + + + @Column(name = "NAME") + private String name; + + + + @Column(name = "DESCRIPTION") + private String description; + + + + + /** + * Gets the Code. + * + * return the Code + */ + public int getCode() + { + return code; + } + + /** + * Sets the Code. + * + * @param code the Code + */ + public void setCode(int code) + { + this.code = code; + } + + + /** + * Gets the Name. + * + * return the Name + */ + public String getName() + { + return name; + } + + /** + * Sets the Name. + * + * @param name the Name + */ + public void setName(String name) + { + this.name = name; + } + + + /** + * Gets the Description. + * + * return the Description + */ + public String getDescription() + { + return description; + } + + /** + * Sets the Description. + * + * @param description the Description + */ + public void setDescription(String description) + { + this.description = description; + } + + } 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/Liquid.java deleted file mode 100644 index 6d43161f7..000000000 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Liquid.java +++ /dev/null @@ -1,120 +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 = "LIQUIDS", database = TangoDB.class) - public class Liquid extends Entity - { - - @Column(name = "CODE") - private int code; - - - - @Column(name = "NAME") - private String name; - - - - @Column(name = "VERSION") - private Double version; - - - - @Column(name = "COLOR") - private int color; - - - - - /** - * Gets the Code. - * - * return the Code - */ - public int getCode() - { - return code; - } - - /** - * Sets the Code. - * - * @param code the Code - */ - public void setCode(int code) - { - this.code = code; - } - - - /** - * Gets the Name. - * - * return the Name - */ - public String getName() - { - return name; - } - - /** - * Sets the Name. - * - * @param name the Name - */ - public void setName(String name) - { - this.name = name; - } - - - /** - * Gets the Version. - * - * return the Version - */ - public Double getVersion() - { - return version; - } - - /** - * Sets the Version. - * - * @param version the Version - */ - public void setVersion(Double version) - { - this.version = version; - } - - - /** - * Gets the Color. - * - * return the Color - */ - public int getColor() - { - return color; - } - - /** - * Sets the Color. - * - * @param color the Color - */ - public void setColor(int color) - { - this.color = color; - } - - } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java new file mode 100644 index 000000000..92461e3ed --- /dev/null +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java @@ -0,0 +1,120 @@ +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 = "LIQUID_TYPES", database = TangoDB.class) + public class LiquidType extends Entity + { + + @Column(name = "CODE") + private int code; + + + + @Column(name = "NAME") + private String name; + + + + @Column(name = "VERSION") + private Double version; + + + + @Column(name = "COLOR") + private int color; + + + + + /** + * Gets the Code. + * + * return the Code + */ + public int getCode() + { + return code; + } + + /** + * Sets the Code. + * + * @param code the Code + */ + public void setCode(int code) + { + this.code = code; + } + + + /** + * Gets the Name. + * + * return the Name + */ + public String getName() + { + return name; + } + + /** + * Sets the Name. + * + * @param name the Name + */ + public void setName(String name) + { + this.name = name; + } + + + /** + * Gets the Version. + * + * return the Version + */ + public Double getVersion() + { + return version; + } + + /** + * Sets the Version. + * + * @param version the Version + */ + public void setVersion(Double version) + { + this.version = version; + } + + + /** + * Gets the Color. + * + * return the Color + */ + public int getColor() + { + return color; + } + + /** + * Sets the Color. + * + * @param color the Color + */ + public void setColor(int color) + { + this.color = color; + } + + } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java new file mode 100644 index 000000000..db5f43933 --- /dev/null +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.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 = "LIQUID_TYPES_RMLS", database = TangoDB.class) + public class LiquidTypesRml extends Entity + { + + @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")}) + private LiquidType liquidType; + + + + @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")}) + private Rml rml; + + + + + /** + * Gets the LiquidType. + * + * return the LiquidType + */ + public LiquidType getLiquidType() + { + return liquidType; + } + + /** + * Sets the LiquidType. + * + * @param liquidType the LiquidType + */ + public void setLiquidType(LiquidType liquidType) + { + this.liquidType = liquidType; + } + + + /** + * Gets the Rml. + * + * return the Rml + */ + public Rml getRml() + { + return rml; + } + + /** + * Sets the Rml. + * + * @param rml the Rml + */ + public void setRml(Rml rml) + { + this.rml = rml; + } + + } 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/LiquidsRml.java deleted file mode 100644 index ea79f4741..000000000 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidsRml.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 = "LIQUIDS_RMLS", database = TangoDB.class) - public class LiquidsRml extends Entity - { - - @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_GUID", foreignKeyColumnName = "GUID")}) - private Liquid liquid; - - - - @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")}) - private Rml rml; - - - - - /** - * Gets the Liquid. - * - * return the Liquid - */ - public Liquid getLiquid() - { - return liquid; - } - - /** - * Sets the Liquid. - * - * @param liquid the Liquid - */ - public void setLiquid(Liquid liquid) - { - this.liquid = liquid; - } - - - /** - * Gets the Rml. - * - * return the Rml - */ - public Rml getRml() - { - return rml; - } - - /** - * Sets the Rml. - * - * @param rml the Rml - */ - public void setRml(Rml rml) - { - this.rml = rml; - } - - } 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; @@ -102,6 +107,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. * 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 index 277930e15..2a238547c 100644 Binary files a/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb and b/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb differ diff --git a/Software/DB/Tango.db b/Software/DB/Tango.db index 277930e15..2a238547c 100644 Binary files a/Software/DB/Tango.db and b/Software/DB/Tango.db differ diff --git a/Software/DB/Tango.db-journal b/Software/DB/Tango.db-journal deleted file mode 100644 index 1b843ca54..000000000 Binary files a/Software/DB/Tango.db-journal and /dev/null differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index ad5a04b7d..b9d42ecc7 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 0a2572d72..a9811dfa7 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ 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 @@ + @@ -106,9 +107,10 @@ + - + @@ -149,11 +151,11 @@ IdsPackView.xaml - - LiquidView.xaml + + LiquidTypeView.xaml - - LiquidsView.xaml + + LiquidTypesView.xaml HardwareVersionView.xaml @@ -306,11 +308,11 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer 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(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); - SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); } @@ -195,11 +195,11 @@ namespace Tango.MachineStudio.DB } } - public static LiquidsViewVM LiquidsViewVM + public static LiquidTypesViewVM LiquidTypesViewVM { get { - return ServiceLocator.Current.GetInstance(); + return ServiceLocator.Current.GetInstance(); } } @@ -218,5 +218,13 @@ namespace Tango.MachineStudio.DB return ServiceLocator.Current.GetInstance(); } } + + public static EventTypesViewVM EventTypesViewVM + { + get + { + return ServiceLocator.Current.GetInstance(); + } + } } } \ 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 + { + public ActionsTypesViewVM(INotificationProvider notification) : base(notification) + { + + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs new file mode 100644 index 000000000..442eac908 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.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 EventTypesViewVM : DbTableViewModel + { + 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 + { + public LiquidTypesViewVM(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/LiquidsViewVM.cs deleted file mode 100644 index e57f6606e..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidsViewVM.cs +++ /dev/null @@ -1,17 +0,0 @@ -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 LiquidsViewVM : DbTableViewModel - { - public LiquidsViewVM(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 @@ - - + + 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 @@ - + - + - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml new file mode 100644 index 000000000..3a14b27df --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml.cs new file mode 100644 index 000000000..f82defb24 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypeView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.MachineStudio.DB.Views.DBViews +{ + /// + /// Interaction logic for MachineView.xaml + /// + public partial class LiquidTypeView : UserControl + { + public LiquidTypeView() + { + InitializeComponent(); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml new file mode 100644 index 000000000..4e1fe4279 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml.cs new file mode 100644 index 000000000..2bdb8ec67 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesView.xaml.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using Tango.MachineStudio.DB.CustomAttributes; +using Tango.MachineStudio.DB.Managers; +using Tango.SharedUI.Controls; + +namespace Tango.MachineStudio.DB.Views.DBViews +{ + /// + /// Interaction logic for MachinesView.xaml + /// + [DBView] + public partial class LiquidTypesView : UserControl + { + public LiquidTypesView() : base() + { + InitializeComponent(); + } + } +} 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/LiquidView.xaml deleted file mode 100644 index 19bcc2674..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidView.xaml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/LiquidView.xaml.cs deleted file mode 100644 index 653def003..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidView.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// - /// Interaction logic for MachineView.xaml - /// - public partial class LiquidView : UserControl - { - public LiquidView() - { - 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/LiquidsView.xaml deleted file mode 100644 index 749b0ccd7..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidsView.xaml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/LiquidsView.xaml.cs deleted file mode 100644 index 2d68d5ef5..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidsView.xaml.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Tango.MachineStudio.DB.CustomAttributes; -using Tango.MachineStudio.DB.Managers; -using Tango.SharedUI.Controls; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// - /// Interaction logic for MachinesView.xaml - /// - [DBView] - public partial class LiquidsView : UserControl - { - public LiquidsView() : base() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION.cs deleted file mode 100644 index 6bc2a9274..000000000 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Local.DB -{ - using System; - using System.Collections.Generic; - - public partial class ACTION - { - public long ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } - public long CODE { get; set; } - public string NAME { get; set; } - public string DESCRIPTION { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs new file mode 100644 index 000000000..a0297f529 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Local.DB +{ + using System; + using System.Collections.Generic; + + public partial class ACTION_TYPES + { + public long ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public bool DELETED { get; set; } + public long CODE { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs deleted file mode 100644 index 636c9d31a..000000000 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Local.DB -{ - using System; - using System.Collections.Generic; - - public partial class EVENT - { - public long ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } - public string NAME { get; set; } - public string DESCRIPTION { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENTS_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENTS_ACTIONS.cs deleted file mode 100644 index 3c1c30eec..000000000 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENTS_ACTIONS.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Local.DB -{ - using System; - using System.Collections.Generic; - - public partial class EVENTS_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; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs new file mode 100644 index 000000000..3ec964cb8 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Local.DB +{ + using System; + using System.Collections.Generic; + + public partial class EVENT_TYPES + { + public long ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public bool DELETED { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs new file mode 100644 index 000000000..0e7ba0913 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Local.DB +{ + using System; + using System.Collections.Generic; + + 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_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.cs deleted file mode 100644 index 9c70544ca..000000000 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Local.DB -{ - using System; - using System.Collections.Generic; - - public partial class LIQUID - { - public long ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } - public long CODE { get; set; } - public string NAME { get; set; } - public double VERSION { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUIDS_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUIDS_RMLS.cs deleted file mode 100644 index 9d613062c..000000000 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUIDS_RMLS.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Local.DB -{ - using System; - using System.Collections.Generic; - - public partial class LIQUIDS_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 RML_GUID { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs new file mode 100644 index 000000000..652d219ba --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Local.DB +{ + using System; + using System.Collections.Generic; + + public partial class LIQUID_TYPES + { + public long ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public bool DELETED { get; set; } + public long CODE { get; set; } + public string NAME { get; set; } + public double VERSION { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs new file mode 100644 index 000000000..cd8865526 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Local.DB +{ + using System; + using System.Collections.Generic; + + 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_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 ACTIONS { get; set; } + public virtual DbSet ACTION_TYPES { get; set; } public virtual DbSet
ADDRESSES { get; set; } public virtual DbSet APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; } public virtual DbSet APPLICATION_FIRMWARE_VERSIONS { get; set; } @@ -39,15 +39,15 @@ namespace Tango.DAL.Local.DB public virtual DbSet DISPENSERS { get; set; } public virtual DbSet EMBEDDED_FIRMWARE_VERSIONS { get; set; } public virtual DbSet EMBEDDED_SOFTWARE_VERSIONS { get; set; } - public virtual DbSet EVENTS { get; set; } - public virtual DbSet EVENTS_ACTIONS { get; set; } + public virtual DbSet EVENT_TYPES { get; set; } + public virtual DbSet EVENT_TYPES_ACTIONS { get; set; } public virtual DbSet FIBER_SHAPES { get; set; } public virtual DbSet FIBER_SYNTHESISES { get; set; } public virtual DbSet HARDWARE_VERSIONS { get; set; } public virtual DbSet IDS_PACKS { get; set; } public virtual DbSet LINEAR_MASS_DENSITY_UNITS { get; set; } - public virtual DbSet LIQUIDS { get; set; } - public virtual DbSet LIQUIDS_RMLS { get; set; } + public virtual DbSet LIQUID_TYPES { get; set; } + public virtual DbSet LIQUID_TYPES_RMLS { get; set; } public virtual DbSet MACHINE_VERSIONS { get; set; } public virtual DbSet MACHINES { get; set; } public virtual DbSet 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 @@ - + @@ -158,7 +158,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -177,8 +177,8 @@ - - + + @@ -217,7 +217,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -249,7 +249,7 @@ - + @@ -275,6 +275,7 @@ + @@ -296,7 +297,7 @@ - + @@ -446,7 +447,7 @@ - + @@ -460,15 +461,15 @@ - - + + - - + + @@ -491,7 +492,7 @@ - + @@ -505,15 +506,15 @@ - - + + - - + + @@ -531,7 +532,7 @@ - + @@ -684,7 +685,7 @@ - + @@ -695,7 +696,7 @@ - + @@ -703,8 +704,8 @@ - - + + @@ -743,7 +744,7 @@ - + @@ -755,7 +756,7 @@ - + @@ -767,7 +768,7 @@ - + @@ -775,7 +776,7 @@ - + @@ -801,6 +802,7 @@ + @@ -822,7 +824,7 @@ - + @@ -977,9 +979,9 @@ - - - + + + @@ -1144,9 +1146,9 @@ - - - + + + @@ -1156,11 +1158,11 @@ - - - - - + + + + + @@ -1202,7 +1204,7 @@ - + @@ -1222,9 +1224,9 @@ - - - + + + @@ -1235,11 +1237,11 @@ - - - + + + - + @@ -1261,6 +1263,7 @@ + @@ -1291,7 +1294,7 @@ - + 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 @@ - + @@ -19,15 +19,15 @@ - - + + - - + + 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 @@ GlobalVersionInfo.cs - + LocalADO.tt @@ -107,10 +107,10 @@ LocalADO.tt - + LocalADO.tt - + LocalADO.tt @@ -128,10 +128,10 @@ LocalADO.tt - + LocalADO.tt - + LocalADO.tt diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Action.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Action.cs deleted file mode 100644 index f011fba71..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Action.cs +++ /dev/null @@ -1,117 +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("ACTIONS")] - public class Action : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the action code. - /// - [EntityFieldName("CODE")] - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the action name. - /// - [EntityFieldName("NAME")] - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the action description. - /// - [EntityFieldName("DESCRIPTION")] - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private ObservableCollection _eventsactions; - /// - /// Gets or sets the action events actions. - /// - [EntityFieldName("EVENTS_ACTIONS")] - public ObservableCollection EventsActions - { - get - { - return _eventsactions; - } - - set - { - _eventsactions = value; RaisePropertyChanged(nameof(EventsActions)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Action() : base() - { - Init(); - } - - /// - /// Initializes a new instance of the class. - /// - /// The entity. - public Action(ACTION entity) : base(entity) - { - Init(); - MapEntityToObservable(entity, this); - } - - /// - /// Initialize complex types. - /// - private void Init() - { - - EventsActions = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ActionType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ActionType.cs new file mode 100644 index 000000000..7618320f8 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ActionType.cs @@ -0,0 +1,117 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.DAL.Observables +{ + [EntityFieldName("ACTION_TYPES")] + public class ActionType : ObservableEntity + { + + private Int32 _code; + /// + /// Gets or sets the actiontype code. + /// + [EntityFieldName("CODE")] + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + private String _name; + /// + /// Gets or sets the actiontype name. + /// + [EntityFieldName("NAME")] + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + private String _description; + /// + /// Gets or sets the actiontype description. + /// + [EntityFieldName("DESCRIPTION")] + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + private ObservableCollection _eventtypesactions; + /// + /// Gets or sets the actiontype event types actions. + /// + [EntityFieldName("EVENT_TYPES_ACTIONS")] + public ObservableCollection EventTypesActions + { + get + { + return _eventtypesactions; + } + + set + { + _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public ActionType() : base() + { + Init(); + } + + /// + /// Initializes a new instance of the class. + /// + /// The entity. + public ActionType(ACTION_TYPES entity) : base(entity) + { + Init(); + MapEntityToObservable(entity, this); + } + + /// + /// Initialize complex types. + /// + private void Init() + { + + EventTypesActions = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Event.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Event.cs deleted file mode 100644 index 6ff14beb0..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Event.cs +++ /dev/null @@ -1,138 +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")] - public class Event : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the event code. - /// - [EntityFieldName("CODE")] - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the event name. - /// - [EntityFieldName("NAME")] - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the event description. - /// - [EntityFieldName("DESCRIPTION")] - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private ObservableCollection _eventsactions; - /// - /// Gets or sets the event events actions. - /// - [EntityFieldName("EVENTS_ACTIONS")] - public ObservableCollection EventsActions - { - get - { - return _eventsactions; - } - - set - { - _eventsactions = value; RaisePropertyChanged(nameof(EventsActions)); - } - - } - - private ObservableCollection _machinesevents; - /// - /// Gets or sets the event machines events. - /// - [EntityFieldName("MACHINES_EVENTS")] - public ObservableCollection MachinesEvents - { - get - { - return _machinesevents; - } - - set - { - _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Event() : base() - { - Init(); - } - - /// - /// Initializes a new instance of the class. - /// - /// The entity. - public Event(EVENT entity) : base(entity) - { - Init(); - MapEntityToObservable(entity, this); - } - - /// - /// Initialize complex types. - /// - private void Init() - { - - EventsActions = new ObservableCollection(); - - MachinesEvents = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventType.cs new file mode 100644 index 000000000..85153d393 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventType.cs @@ -0,0 +1,138 @@ +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")] + public class EventType : ObservableEntity + { + + private Int32 _code; + /// + /// Gets or sets the eventtype code. + /// + [EntityFieldName("CODE")] + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + private String _name; + /// + /// Gets or sets the eventtype name. + /// + [EntityFieldName("NAME")] + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + private String _description; + /// + /// Gets or sets the eventtype description. + /// + [EntityFieldName("DESCRIPTION")] + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + private ObservableCollection _eventtypesactions; + /// + /// Gets or sets the eventtype event types actions. + /// + [EntityFieldName("EVENT_TYPES_ACTIONS")] + public ObservableCollection EventTypesActions + { + get + { + return _eventtypesactions; + } + + set + { + _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); + } + + } + + private ObservableCollection _machinesevents; + /// + /// Gets or sets the eventtype machines events. + /// + [EntityFieldName("MACHINES_EVENTS")] + public ObservableCollection MachinesEvents + { + get + { + return _machinesevents; + } + + set + { + _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public EventType() : base() + { + Init(); + } + + /// + /// Initializes a new instance of the class. + /// + /// The entity. + public EventType(EVENT_TYPES entity) : base(entity) + { + Init(); + MapEntityToObservable(entity, this); + } + + /// + /// Initialize complex types. + /// + private void Init() + { + + EventTypesActions = new ObservableCollection(); + + MachinesEvents = new ObservableCollection(); + + } + } +} 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 + { + + private String _eventtypeguid; + /// + /// Gets or sets the eventtypesaction event type guid. + /// + [EntityFieldName("EVENT_TYPE_GUID")] + public String EventTypeGuid + { + get + { + return _eventtypeguid; + } + + set + { + _eventtypeguid = value; RaisePropertyChanged(nameof(EventTypeGuid)); + } + + } + + private String _actiontypeguid; + /// + /// Gets or sets the eventtypesaction action type guid. + /// + [EntityFieldName("ACTION_TYPE_GUID")] + public String ActionTypeGuid + { + get + { + return _actiontypeguid; + } + + set + { + _actiontypeguid = value; RaisePropertyChanged(nameof(ActionTypeGuid)); + } + + } + + private ActionType _actiontypes; + /// + /// Gets or sets the eventtypesaction action types. + /// + [EntityFieldName("ACTION_TYPES")] + public ActionType ActionTypes + { + get + { + return _actiontypes; + } + + set + { + _actiontypes = value; RaisePropertyChanged(nameof(ActionTypes)); + } + + } + + private EventType _eventtypes; + /// + /// Gets or sets the eventtypesaction event types. + /// + [EntityFieldName("EVENT_TYPES")] + public EventType EventTypes + { + get + { + return _eventtypes; + } + + set + { + _eventtypes = value; RaisePropertyChanged(nameof(EventTypes)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public EventTypesAction() : base() + { + Init(); + } + + /// + /// Initializes a new instance of the class. + /// + /// The entity. + public EventTypesAction(EVENT_TYPES_ACTIONS entity) : base(entity) + { + Init(); + MapEntityToObservable(entity, this); + } + + /// + /// Initialize complex types. + /// + 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 - { - - private String _eventguid; - /// - /// Gets or sets the eventsaction event guid. - /// - [EntityFieldName("EVENT_GUID")] - public String EventGuid - { - get - { - return _eventguid; - } - - set - { - _eventguid = value; RaisePropertyChanged(nameof(EventGuid)); - } - - } - - private String _actionguid; - /// - /// Gets or sets the eventsaction action guid. - /// - [EntityFieldName("ACTION_GUID")] - public String ActionGuid - { - get - { - return _actionguid; - } - - set - { - _actionguid = value; RaisePropertyChanged(nameof(ActionGuid)); - } - - } - - private Action _action; - /// - /// Gets or sets the eventsaction action. - /// - [EntityFieldName("ACTION")] - public Action Action - { - get - { - return _action; - } - - set - { - _action = value; RaisePropertyChanged(nameof(Action)); - } - - } - - private Event _event; - /// - /// Gets or sets the eventsaction event. - /// - [EntityFieldName("EVENT")] - public Event Event - { - get - { - return _event; - } - - set - { - _event = value; RaisePropertyChanged(nameof(Event)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public EventsAction() : base() - { - Init(); - } - - /// - /// Initializes a new instance of the class. - /// - /// The entity. - public EventsAction(EVENTS_ACTIONS entity) : base(entity) - { - Init(); - MapEntityToObservable(entity, this); - } - - /// - /// Initialize complex types. - /// - 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; /// - /// Gets or sets the idspack liquid guid. + /// Gets or sets the idspack liquid type guid. /// - [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; /// - /// Gets or sets the idspack liquid. + /// Gets or sets the idspack liquid types. /// - [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/Liquid.cs deleted file mode 100644 index 13e8eb15a..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Liquid.cs +++ /dev/null @@ -1,157 +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("LIQUIDS")] - public class Liquid : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the liquid code. - /// - [EntityFieldName("CODE")] - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the liquid name. - /// - [EntityFieldName("NAME")] - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Double _version; - /// - /// Gets or sets the liquid version. - /// - [EntityFieldName("VERSION")] - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private Int32 _color; - /// - /// Gets or sets the liquid color. - /// - [EntityFieldName("COLOR")] - public Int32 Color - { - get - { - return _color; - } - - set - { - _color = value; RaisePropertyChanged(nameof(Color)); - } - - } - - private ObservableCollection _idspacks; - /// - /// Gets or sets the liquid ids packs. - /// - [EntityFieldName("IDS_PACKS")] - public ObservableCollection IdsPacks - { - get - { - return _idspacks; - } - - set - { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } - - } - - private ObservableCollection _liquidsrmls; - /// - /// Gets or sets the liquid liquids rmls. - /// - [EntityFieldName("LIQUIDS_RMLS")] - public ObservableCollection LiquidsRmls - { - get - { - return _liquidsrmls; - } - - set - { - _liquidsrmls = value; RaisePropertyChanged(nameof(LiquidsRmls)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Liquid() : base() - { - Init(); - } - - /// - /// Initializes a new instance of the class. - /// - /// The entity. - public Liquid(LIQUID entity) : base(entity) - { - Init(); - MapEntityToObservable(entity, this); - } - - /// - /// Initialize complex types. - /// - private void Init() - { - - IdsPacks = new ObservableCollection(); - - LiquidsRmls = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs new file mode 100644 index 000000000..613d6a739 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs @@ -0,0 +1,157 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.DAL.Observables +{ + [EntityFieldName("LIQUID_TYPES")] + public class LiquidType : ObservableEntity + { + + private Int32 _code; + /// + /// Gets or sets the liquidtype code. + /// + [EntityFieldName("CODE")] + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + private String _name; + /// + /// Gets or sets the liquidtype name. + /// + [EntityFieldName("NAME")] + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + private Double _version; + /// + /// Gets or sets the liquidtype version. + /// + [EntityFieldName("VERSION")] + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + private Int32 _color; + /// + /// Gets or sets the liquidtype color. + /// + [EntityFieldName("COLOR")] + public Int32 Color + { + get + { + return _color; + } + + set + { + _color = value; RaisePropertyChanged(nameof(Color)); + } + + } + + private ObservableCollection _idspacks; + /// + /// Gets or sets the liquidtype ids packs. + /// + [EntityFieldName("IDS_PACKS")] + public ObservableCollection IdsPacks + { + get + { + return _idspacks; + } + + set + { + _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); + } + + } + + private ObservableCollection _liquidtypesrmls; + /// + /// Gets or sets the liquidtype liquid types rmls. + /// + [EntityFieldName("LIQUID_TYPES_RMLS")] + public ObservableCollection LiquidTypesRmls + { + get + { + return _liquidtypesrmls; + } + + set + { + _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public LiquidType() : base() + { + Init(); + } + + /// + /// Initializes a new instance of the class. + /// + /// The entity. + public LiquidType(LIQUID_TYPES entity) : base(entity) + { + Init(); + MapEntityToObservable(entity, this); + } + + /// + /// Initialize complex types. + /// + private void Init() + { + + IdsPacks = new ObservableCollection(); + + LiquidTypesRmls = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs new file mode 100644 index 000000000..5b5d73fef --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.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("LIQUID_TYPES_RMLS")] + public class LiquidTypesRml : ObservableEntity + { + + private String _liquidtypeguid; + /// + /// Gets or sets the liquidtypesrml liquid type guid. + /// + [EntityFieldName("LIQUID_TYPE_GUID")] + public String LiquidTypeGuid + { + get + { + return _liquidtypeguid; + } + + set + { + _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); + } + + } + + private String _rmlguid; + /// + /// Gets or sets the liquidtypesrml rml guid. + /// + [EntityFieldName("RML_GUID")] + public String RmlGuid + { + get + { + return _rmlguid; + } + + set + { + _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + } + + } + + private LiquidType _liquidtypes; + /// + /// Gets or sets the liquidtypesrml liquid types. + /// + [EntityFieldName("LIQUID_TYPES")] + public LiquidType LiquidTypes + { + get + { + return _liquidtypes; + } + + set + { + _liquidtypes = value; RaisePropertyChanged(nameof(LiquidTypes)); + } + + } + + private Rml _rml; + /// + /// Gets or sets the liquidtypesrml rml. + /// + [EntityFieldName("RML")] + public Rml Rml + { + get + { + return _rml; + } + + set + { + _rml = value; RaisePropertyChanged(nameof(Rml)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public LiquidTypesRml() : base() + { + Init(); + } + + /// + /// Initializes a new instance of the class. + /// + /// The entity. + public LiquidTypesRml(LIQUID_TYPES_RMLS entity) : base(entity) + { + Init(); + MapEntityToObservable(entity, this); + } + + /// + /// Initialize complex types. + /// + private void Init() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidsRml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidsRml.cs deleted file mode 100644 index b12a3cef6..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidsRml.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("LIQUIDS_RMLS")] - public class LiquidsRml : ObservableEntity - { - - private String _liquidguid; - /// - /// Gets or sets the liquidsrml liquid guid. - /// - [EntityFieldName("LIQUID_GUID")] - public String LiquidGuid - { - get - { - return _liquidguid; - } - - set - { - _liquidguid = value; RaisePropertyChanged(nameof(LiquidGuid)); - } - - } - - private String _rmlguid; - /// - /// Gets or sets the liquidsrml rml guid. - /// - [EntityFieldName("RML_GUID")] - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); - } - - } - - private Liquid _liquid; - /// - /// Gets or sets the liquidsrml liquid. - /// - [EntityFieldName("LIQUID")] - public Liquid Liquid - { - get - { - return _liquid; - } - - set - { - _liquid = value; RaisePropertyChanged(nameof(Liquid)); - } - - } - - private Rml _rml; - /// - /// Gets or sets the liquidsrml rml. - /// - [EntityFieldName("RML")] - public Rml Rml - { - get - { - return _rml; - } - - set - { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public LiquidsRml() : base() - { - Init(); - } - - /// - /// Initializes a new instance of the class. - /// - /// The entity. - public LiquidsRml(LIQUIDS_RMLS entity) : base(entity) - { - Init(); - MapEntityToObservable(entity, this); - } - - /// - /// Initialize complex types. - /// - private void Init() - { - } - } -} 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; /// - /// Gets or sets the machinesevent event guid. + /// Gets or sets the machinesevent event type guid. /// - [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; /// - /// Gets or sets the machinesevent event. + /// Gets or sets the machinesevent event types. /// - [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 _liquidsrmls; + private ObservableCollection _liquidtypesrmls; /// - /// Gets or sets the rml liquids rmls. + /// Gets or sets the rml liquid types rmls. /// - [EntityFieldName("LIQUIDS_RMLS")] - public ObservableCollection LiquidsRmls + [EntityFieldName("LIQUID_TYPES_RMLS")] + public ObservableCollection 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(); + LiquidTypesRmls = new ObservableCollection(); } } 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 + { + + /// + /// (Cyan) + /// + [Description("Cyan")] + Cyan = 1, + + /// + /// (Magenta) + /// + [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(x)).ToObservableCollection(); - Liquids = Context.LIQUIDS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + LiquidTypes = Context.LIQUID_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); Cartridges = Context.CARTRIDGES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(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 _actions; + private ObservableCollection _actiontypes; /// - /// Gets or sets the Actions. + /// Gets or sets the ActionTypes. /// - public ObservableCollection Actions + public ObservableCollection ActionTypes { get { - return _actions; + return _actiontypes; } set { - _actions = value; RaisePropertyChanged(nameof(Actions)); + _actiontypes = value; RaisePropertyChanged(nameof(ActionTypes)); } } - private ICollectionView _actionsViewSource; + private ICollectionView _actiontypesViewSource; /// - /// Gets or sets the Actions View Source. + /// Gets or sets the ActionTypes View Source. /// - 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 _events; + private ObservableCollection _eventtypes; /// - /// Gets or sets the Events. + /// Gets or sets the EventTypes. /// - public ObservableCollection Events + public ObservableCollection EventTypes { get { - return _events; + return _eventtypes; } set { - _events = value; RaisePropertyChanged(nameof(Events)); + _eventtypes = value; RaisePropertyChanged(nameof(EventTypes)); } } - private ICollectionView _eventsViewSource; + private ICollectionView _eventtypesViewSource; /// - /// Gets or sets the Events View Source. + /// Gets or sets the EventTypes View Source. /// - public ICollectionView EventsViewSource + public ICollectionView EventTypesViewSource { get { - return _eventsViewSource; + return _eventtypesViewSource; } set { - _eventsViewSource = value; RaisePropertyChanged(nameof(EventsViewSource)); + _eventtypesViewSource = value; RaisePropertyChanged(nameof(EventTypesViewSource)); } } - private ObservableCollection _eventsactions; + private ObservableCollection _eventtypesactions; /// - /// Gets or sets the EventsActions. + /// Gets or sets the EventTypesActions. /// - public ObservableCollection EventsActions + public ObservableCollection EventTypesActions { get { - return _eventsactions; + return _eventtypesactions; } set { - _eventsactions = value; RaisePropertyChanged(nameof(EventsActions)); + _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); } } - private ICollectionView _eventsactionsViewSource; + private ICollectionView _eventtypesactionsViewSource; /// - /// Gets or sets the EventsActions View Source. + /// Gets or sets the EventTypesActions View Source. /// - 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 _liquids; + private ObservableCollection _liquidtypes; /// - /// Gets or sets the Liquids. + /// Gets or sets the LiquidTypes. /// - public ObservableCollection Liquids + public ObservableCollection LiquidTypes { get { - return _liquids; + return _liquidtypes; } set { - _liquids = value; RaisePropertyChanged(nameof(Liquids)); + _liquidtypes = value; RaisePropertyChanged(nameof(LiquidTypes)); } } - private ICollectionView _liquidsViewSource; + private ICollectionView _liquidtypesViewSource; /// - /// Gets or sets the Liquids View Source. + /// Gets or sets the LiquidTypes View Source. /// - public ICollectionView LiquidsViewSource + public ICollectionView LiquidTypesViewSource { get { - return _liquidsViewSource; + return _liquidtypesViewSource; } set { - _liquidsViewSource = value; RaisePropertyChanged(nameof(LiquidsViewSource)); + _liquidtypesViewSource = value; RaisePropertyChanged(nameof(LiquidTypesViewSource)); } } - private ObservableCollection _liquidsrmls; + private ObservableCollection _liquidtypesrmls; /// - /// Gets or sets the LiquidsRmls. + /// Gets or sets the LiquidTypesRmls. /// - public ObservableCollection LiquidsRmls + public ObservableCollection LiquidTypesRmls { get { - return _liquidsrmls; + return _liquidtypesrmls; } set { - _liquidsrmls = value; RaisePropertyChanged(nameof(LiquidsRmls)); + _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); } } - private ICollectionView _liquidsrmlsViewSource; + private ICollectionView _liquidtypesrmlsViewSource; /// - /// Gets or sets the LiquidsRmls View Source. + /// Gets or sets the LiquidTypesRmls View Source. /// - 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 @@ GlobalVersionInfo.cs + + + + + @@ -80,7 +85,6 @@ - @@ -94,14 +98,10 @@ - - - - diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION.cs deleted file mode 100644 index 3f39ea77d..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION.cs +++ /dev/null @@ -1,34 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class ACTION - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public ACTION() - { - this.EVENTS_ACTIONS = new HashSet(); - } - - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } - public int CODE { get; set; } - public string NAME { get; set; } - public string DESCRIPTION { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection EVENTS_ACTIONS { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs new file mode 100644 index 000000000..1c71eb314 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs @@ -0,0 +1,34 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class ACTION_TYPES + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public ACTION_TYPES() + { + this.EVENT_TYPES_ACTIONS = new HashSet(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public bool DELETED { get; set; } + public int CODE { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection 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.cs deleted file mode 100644 index 556d2d789..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT.cs +++ /dev/null @@ -1,37 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class EVENT - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public EVENT() - { - this.EVENTS_ACTIONS = new HashSet(); - this.MACHINES_EVENTS = new HashSet(); - } - - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } - public int CODE { get; set; } - public string NAME { get; set; } - public string DESCRIPTION { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection EVENTS_ACTIONS { get; set; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection 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/EVENTS_ACTIONS.cs deleted file mode 100644 index 9b20e63e4..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENTS_ACTIONS.cs +++ /dev/null @@ -1,27 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class EVENTS_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 virtual ACTION ACTION { get; set; } - public virtual EVENT EVENT { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs new file mode 100644 index 000000000..1eb478383 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs @@ -0,0 +1,37 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class EVENT_TYPES + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public EVENT_TYPES() + { + this.EVENT_TYPES_ACTIONS = new HashSet(); + this.MACHINES_EVENTS = new HashSet(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public bool DELETED { get; set; } + public int CODE { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection EVENT_TYPES_ACTIONS { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection MACHINES_EVENTS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs new file mode 100644 index 000000000..003e4293e --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs @@ -0,0 +1,27 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + 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_TYPE_GUID { get; set; } + public string ACTION_TYPE_GUID { 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.cs deleted file mode 100644 index b6a4ce67c..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID.cs +++ /dev/null @@ -1,38 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class LIQUID - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public LIQUID() - { - this.IDS_PACKS = new HashSet(); - this.LIQUIDS_RMLS = new HashSet(); - } - - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } - public int CODE { get; set; } - public string NAME { get; set; } - public double VERSION { get; set; } - public int COLOR { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection IDS_PACKS { get; set; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection LIQUIDS_RMLS { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUIDS_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUIDS_RMLS.cs deleted file mode 100644 index 4cf186ab5..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUIDS_RMLS.cs +++ /dev/null @@ -1,27 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class LIQUIDS_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 RML_GUID { get; set; } - - public virtual LIQUID LIQUID { get; set; } - public virtual RML RML { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs new file mode 100644 index 000000000..13821ad8d --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs @@ -0,0 +1,38 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class LIQUID_TYPES + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public LIQUID_TYPES() + { + this.IDS_PACKS = new HashSet(); + this.LIQUID_TYPES_RMLS = new HashSet(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public bool DELETED { get; set; } + public int CODE { get; set; } + public string NAME { get; set; } + public double VERSION { get; set; } + public int COLOR { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection IDS_PACKS { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection LIQUID_TYPES_RMLS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs new file mode 100644 index 000000000..c77b4fa5d --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs @@ -0,0 +1,27 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + 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_TYPE_GUID { get; set; } + public string RML_GUID { 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(); + this.LIQUID_TYPES_RMLS = new HashSet(); } 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 { get; set; } + public virtual ICollection 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 ACTIONS { get; set; } + public virtual DbSet ACTION_TYPES { get; set; } public virtual DbSet
ADDRESSES { get; set; } public virtual DbSet APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; } public virtual DbSet APPLICATION_FIRMWARE_VERSIONS { get; set; } @@ -39,15 +39,15 @@ namespace Tango.DAL.Remote.DB public virtual DbSet DISPENSERS { get; set; } public virtual DbSet EMBEDDED_FIRMWARE_VERSIONS { get; set; } public virtual DbSet EMBEDDED_SOFTWARE_VERSIONS { get; set; } - public virtual DbSet EVENTS { get; set; } - public virtual DbSet EVENTS_ACTIONS { get; set; } + public virtual DbSet EVENT_TYPES { get; set; } + public virtual DbSet EVENT_TYPES_ACTIONS { get; set; } public virtual DbSet FIBER_SHAPES { get; set; } public virtual DbSet FIBER_SYNTHS { get; set; } public virtual DbSet HARDWARE_VERSIONS { get; set; } public virtual DbSet IDS_PACKS { get; set; } public virtual DbSet LINEAR_MASS_DENSITY_UNITS { get; set; } - public virtual DbSet LIQUIDS { get; set; } - public virtual DbSet LIQUIDS_RMLS { get; set; } + public virtual DbSet LIQUID_TYPES { get; set; } + public virtual DbSet LIQUID_TYPES_RMLS { get; set; } public virtual DbSet MACHINE_VERSIONS { get; set; } public virtual DbSet MACHINES { get; set; } public virtual DbSet 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 @@ - + @@ -176,7 +176,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -196,8 +196,8 @@ - - + + @@ -242,7 +242,7 @@ - + @@ -257,7 +257,7 @@ - + @@ -270,7 +270,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -328,7 +328,7 @@ - + @@ -568,14 +568,14 @@ - + - + - + @@ -628,26 +628,26 @@ - - + + - + - - + + - - + + - + - - + + @@ -664,25 +664,25 @@ - - + + - + - - + + - + - + @@ -738,14 +738,14 @@ - + - + - + @@ -998,7 +998,7 @@ - + @@ -1012,15 +1012,15 @@ - - + + - - + + @@ -1066,7 +1066,7 @@ - + @@ -1086,24 +1086,24 @@ - - + + - - + + - - + + - + @@ -1122,7 +1122,7 @@ - + @@ -1211,7 +1211,7 @@ - + @@ -1225,15 +1225,15 @@ - - + + - - + + @@ -1251,8 +1251,8 @@ - - + + @@ -1331,11 +1331,11 @@ - - + + - + @@ -1347,7 +1347,7 @@ - + @@ -1355,12 +1355,12 @@ - - + + - + @@ -1419,7 +1419,7 @@ - + @@ -1430,7 +1430,7 @@ - + @@ -1618,7 +1618,7 @@ - + @@ -1629,10 +1629,10 @@ - - + + - + @@ -1640,10 +1640,10 @@ - - - - + + + + @@ -1691,13 +1691,13 @@ - + - + @@ -1711,7 +1711,7 @@ - + @@ -1723,10 +1723,10 @@ - - + + - + @@ -1734,10 +1734,10 @@ - + - - + + @@ -1795,11 +1795,11 @@ - + - + @@ -1908,7 +1908,7 @@ - + @@ -1982,14 +1982,14 @@ - - + + - + - - + + @@ -2226,26 +2226,26 @@ - - + + - + - - + + - + - + - + @@ -2274,14 +2274,14 @@ - + - + - + @@ -2298,25 +2298,25 @@ - - + + - + - - + + - + - + @@ -2501,9 +2501,9 @@ - - - + + + @@ -2686,9 +2686,9 @@ - - - + + + @@ -2699,11 +2699,11 @@ - - - - - + + + + + @@ -2752,7 +2752,7 @@ - + @@ -2774,9 +2774,9 @@ - - - + + + @@ -2788,11 +2788,11 @@ - - - + + + - + @@ -2847,7 +2847,7 @@ - + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ GlobalVersionInfo.cs - + RemoteADO.tt @@ -107,10 +107,10 @@ RemoteADO.tt - + RemoteADO.tt - + RemoteADO.tt @@ -128,10 +128,10 @@ RemoteADO.tt - + RemoteADO.tt - + RemoteADO.tt -- cgit v1.3.1