Merge branch 'tibor' into 'master'

API 1.0.30+3 Customer properties must not be changed

See merge request bossanyit/aitrainer_server!48

src/main/kotlin/com/aitrainer/api/model/Customer.kt

@@ -16,8 +16,8 @@ data class Customer (
         @Expose var dateAdd: String? = null,
         @Expose var dateChange: String? = null,
         @Expose var dataPolicyAllowed: Int? = 1,
-        @Expose var admin: Boolean? = null,
-        @Expose var trainer: Boolean? = null,
+        @Expose var admin: Int? = null,
+        @Expose var trainer: Int? = null,
         @Expose var trainerId: Long? = null,
         @Expose var password: String? = null,
         @Expose var birthYear:Int = 0,

src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt

@@ -102,7 +102,7 @@ class CustomerTests {
         customer.customerId = id
         customer.firstname = "Tib"
         customer.name = "Bossi"
-        customer.admin = true
+        customer.admin = 1
         customer.active = "Y"
         customer.sex = "m"
 
@@ -139,7 +139,7 @@ class CustomerTests {
         customer.password = null
         customer.firstname = "Tib"
         customer.name = "Bossi"
-        customer.admin = true
+        customer.admin = 1
         customer.sex = "m"
         customer.fitnessLevel = "intermediate"
         //customer.weight = 79