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 15 files changed, 515 insertions(+), 489 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 (limited to 'Software/Android_Studio') 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 -- cgit v1.3.1