Started working on 'Synchronization' - Machine Studio module.

7 files changed, 76 insertions, 32 deletions

diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
index fd41d9230..6cf88e85e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
@@ -9,6 +9,8 @@ import org.joda.time.DateTimeZone;
 
 import java.util.UUID;
 
+import io.reactivex.Single;
+
 
 /**
  * Represents a DAL base entity.
@@ -117,4 +119,11 @@ public class Entity extends BaseRXModel
         setGuid(UUID.randomUUID().toString());
         setLast_updated(DateTime.now(DateTimeZone.UTC));
     }
+    
+    @Override
+    public Single<Boolean> save()
+    {
+        setLast_updated(DateTime.now(DateTimeZone.UTC));
+        return super.save();
+    }
 }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ActionTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ActionTypes.java
new file mode 100644
index 000000000..8233a0b88
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/ActionTypes.java
@@ -0,0 +1,22 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum ActionTypes
+{
+
+    @DescriptionAnnotation(description = "Some description")
+    Action1(1),
+
+    @DescriptionAnnotation(description = "Some action 2 description")
+    Action2(2),
+
+    ;
+
+    private int value;
+
+    ActionTypes(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Actions.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Actions.java
deleted file mode 100644
index 55eebeb78..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Actions.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum Actions
-{
-    ;
-
-    private int value;
-
-    Actions(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypes.java
new file mode 100644
index 000000000..06ecf3f4f
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EventTypes.java
@@ -0,0 +1,22 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum EventTypes
+{
+
+    @DescriptionAnnotation(description = "Some event description")
+    Event1(1),
+
+    @DescriptionAnnotation(description = "Some event 2 description")
+    Event2(2),
+
+    ;
+
+    private int value;
+
+    EventTypes(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Events.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Events.java
deleted file mode 100644
index bfa2e1758..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Events.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.twine.tango.dal.enumerations;
-
-import com.twine.tango.core.DescriptionAnnotation;
-
-public enum Events
-{
-    ;
-
-    private int value;
-
-    Events(int value)
-    {
-        this.value = value;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Liquids.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java
index ca82d56ad..d2d480167 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Liquids.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java
@@ -2,7 +2,7 @@ package com.twine.tango.dal.enumerations;
 
 import com.twine.tango.core.DescriptionAnnotation;
 
-public enum Liquids
+public enum LiquidTypes
 {
 
     @DescriptionAnnotation(description = "Cyan")
@@ -15,7 +15,7 @@ public enum Liquids
 
     private int value;
 
-    Liquids(int value)
+    LiquidTypes(int value)
     {
         this.value = value;
     }
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java
new file mode 100644
index 000000000..f04070d6a
--- /dev/null
+++ b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java
@@ -0,0 +1,21 @@
+package com.twine.tango.unittesting;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.runner.RunWith;
+
+/**
+ * Created by Roy on 12/19/2017.
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class DAL_TST
+{
+    public void perform_basic_dal_test()
+    {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+    }
+}