diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypeOverride.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypeOverride.scala index e17ac431..00f92e1e 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypeOverride.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypeOverride.scala @@ -13,7 +13,7 @@ class ApClassTypeOverride extends StorableClass(ApClassTypeOverride) { val rowId = new IntFieldValue(self, ApClassTypeOverride.fields.rowId) val personId = new IntFieldValue(self, ApClassTypeOverride.fields.personId) val typeId = new IntFieldValue(self, ApClassTypeOverride.fields.typeId) - val season = new DoubleFieldValue(self, ApClassTypeOverride.fields.season) + val season = new IntFieldValue(self, ApClassTypeOverride.fields.season) val createdOn = new NullableDateTimeFieldValue(self, ApClassTypeOverride.fields.createdOn) val createdBy = new NullableStringFieldValue(self, ApClassTypeOverride.fields.createdBy) val updatedOn = new NullableDateTimeFieldValue(self, ApClassTypeOverride.fields.updatedOn) @@ -31,7 +31,7 @@ object ApClassTypeOverride extends StorableObject[ApClassTypeOverride] { val rowId = new IntDatabaseField(self, "ROW_ID") val personId = new IntDatabaseField(self, "PERSON_ID") val typeId = new IntDatabaseField(self, "TYPE_ID") - val season = new DoubleDatabaseField(self, "SEASON") + val season = new IntDatabaseField(self, "SEASON") val createdOn = new NullableDateTimeDatabaseField(self, "CREATED_ON") val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500) val updatedOn = new NullableDateTimeDatabaseField(self, "UPDATED_ON") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypesSeason.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypesSeason.scala index ee62165f..c355f113 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypesSeason.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassTypesSeason.scala @@ -12,7 +12,7 @@ class ApClassTypesSeason extends StorableClass(ApClassTypesSeason) { override object values extends ValuesObject { val assignId = new IntFieldValue(self, ApClassTypesSeason.fields.assignId) val typeId = new IntFieldValue(self, ApClassTypesSeason.fields.typeId) - val season = new DoubleFieldValue(self, ApClassTypesSeason.fields.season) + val season = new IntFieldValue(self, ApClassTypesSeason.fields.season) } } @@ -24,7 +24,7 @@ object ApClassTypesSeason extends StorableObject[ApClassTypesSeason] { object fields extends FieldsObject { val assignId = new IntDatabaseField(self, "ASSIGN_ID") val typeId = new IntDatabaseField(self, "TYPE_ID") - val season = new DoubleDatabaseField(self, "SEASON") + val season = new IntDatabaseField(self, "SEASON") } def primaryKey: IntDatabaseField = fields.assignId diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassVoucher.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassVoucher.scala index 4c9dcd1e..9bac7b42 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassVoucher.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassVoucher.scala @@ -12,7 +12,7 @@ class ApClassVoucher extends StorableClass(ApClassVoucher) { override object values extends ValuesObject { val voucherId = new IntFieldValue(self, ApClassVoucher.fields.voucherId) val personId = new IntFieldValue(self, ApClassVoucher.fields.personId) - val season = new DoubleFieldValue(self, ApClassVoucher.fields.season) + val season = new IntFieldValue(self, ApClassVoucher.fields.season) val value = new DoubleFieldValue(self, ApClassVoucher.fields.value) val createdOn = new NullableDateTimeFieldValue(self, ApClassVoucher.fields.createdOn) val createdBy = new NullableStringFieldValue(self, ApClassVoucher.fields.createdBy) @@ -33,7 +33,7 @@ object ApClassVoucher extends StorableObject[ApClassVoucher] { object fields extends FieldsObject { val voucherId = new IntDatabaseField(self, "VOUCHER_ID") val personId = new IntDatabaseField(self, "PERSON_ID") - val season = new DoubleDatabaseField(self, "SEASON") + val season = new IntDatabaseField(self, "SEASON") val value = new DoubleDatabaseField(self, "VALUE") val createdOn = new NullableDateTimeDatabaseField(self, "CREATED_ON") val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500) diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala index 3d7164e5..fa223e42 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala @@ -18,8 +18,8 @@ class BoatType extends StorableClass(BoatType) { val createdBy = new StringFieldValue(self, BoatType.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, BoatType.fields.updatedOn) val updatedBy = new StringFieldValue(self, BoatType.fields.updatedBy) - val minCrew = new DoubleFieldValue(self, BoatType.fields.minCrew) - val maxCrew = new DoubleFieldValue(self, BoatType.fields.maxCrew) + val minCrew = new IntFieldValue(self, BoatType.fields.minCrew) + val maxCrew = new IntFieldValue(self, BoatType.fields.maxCrew) val imageFilename = new NullableStringFieldValue(self, BoatType.fields.imageFilename) } } @@ -45,9 +45,9 @@ object BoatType extends StorableObject[BoatType] { @NullableInDatabase val updatedBy = new StringDatabaseField(self, "UPDATED_BY", 500) @NullableInDatabase - val minCrew = new DoubleDatabaseField(self, "MIN_CREW") + val minCrew = new IntDatabaseField(self, "MIN_CREW") @NullableInDatabase - val maxCrew = new DoubleDatabaseField(self, "MAX_CREW") + val maxCrew = new IntDatabaseField(self, "MAX_CREW") val imageFilename = new NullableStringDatabaseField(self, "IMAGE_FILENAME", 50) } diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinitionType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinitionType.scala index 65690306..6cd45ce4 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinitionType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDefinitionType.scala @@ -12,7 +12,7 @@ class CardDefinitionType extends StorableClass(CardDefinitionType) { override object values extends ValuesObject { val typeId = new IntFieldValue(self, CardDefinitionType.fields.typeId) val typeName = new StringFieldValue(self, CardDefinitionType.fields.typeName) - val warnAt = new NullableDoubleFieldValue(self, CardDefinitionType.fields.warnAt) + val warnAt = new NullableIntFieldValue(self, CardDefinitionType.fields.warnAt) } } @@ -25,7 +25,7 @@ object CardDefinitionType extends StorableObject[CardDefinitionType] { val typeId = new IntDatabaseField(self, "TYPE_ID") @NullableInDatabase val typeName = new StringDatabaseField(self, "TYPE_NAME", 100) - val warnAt = new NullableDoubleDatabaseField(self, "WARN_AT") + val warnAt = new NullableIntDatabaseField(self, "WARN_AT") } def primaryKey: IntDatabaseField = fields.typeId diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala index f81ad679..67711c5a 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala @@ -12,7 +12,7 @@ class CardDismissal extends StorableClass(CardDismissal) { override object values extends ValuesObject { val dismissalId = new IntFieldValue(self, CardDismissal.fields.dismissalId) val cardAssignId = new IntFieldValue(self, CardDismissal.fields.cardAssignId) - val season = new DoubleFieldValue(self, CardDismissal.fields.season) + val season = new IntFieldValue(self, CardDismissal.fields.season) val createdOn = new DateTimeFieldValue(self, CardDismissal.fields.createdOn) val createdBy = new StringFieldValue(self, CardDismissal.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, CardDismissal.fields.updatedOn) @@ -30,7 +30,7 @@ object CardDismissal extends StorableObject[CardDismissal] { @NullableInDatabase val cardAssignId = new IntDatabaseField(self, "CARD_ASSIGN_ID") @NullableInDatabase - val season = new DoubleDatabaseField(self, "SEASON") + val season = new IntDatabaseField(self, "SEASON") @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") @NullableInDatabase diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Eii.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Eii.scala deleted file mode 100644 index b2ccbbce..00000000 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Eii.scala +++ /dev/null @@ -1,114 +0,0 @@ -package org.sailcbi.APIServer.Entities.EntityDefinitions - -import com.coleji.neptune.Storable.FieldValues._ -import com.coleji.neptune.Storable.Fields._ -import com.coleji.neptune.Storable._ -import com.coleji.neptune.Util._ -import org.sailcbi.APIServer.Entities.NullableInDatabase -import org.sailcbi.APIServer.Entities.entitycalculations._ -import play.api.libs.json._ - -class Eii extends StorableClass(Eii) { - override object values extends ValuesObject { - val id = new IntFieldValue(self, Eii.fields.id) - val desc7 = new NullableStringFieldValue(self, Eii.fields.desc7) - val desc6 = new NullableStringFieldValue(self, Eii.fields.desc6) - val desc5 = new NullableStringFieldValue(self, Eii.fields.desc5) - val desc4 = new NullableStringFieldValue(self, Eii.fields.desc4) - val desc3 = new NullableStringFieldValue(self, Eii.fields.desc3) - val desc2 = new NullableStringFieldValue(self, Eii.fields.desc2) - val desc1 = new StringFieldValue(self, Eii.fields.desc1) - val housing = new DoubleFieldValue(self, Eii.fields.housing) - val utilities = new DoubleFieldValue(self, Eii.fields.utilities) - val food = new DoubleFieldValue(self, Eii.fields.food) - val transportation = new DoubleFieldValue(self, Eii.fields.transportation) - val childCare = new DoubleFieldValue(self, Eii.fields.childCare) - val personalHouseholdNeeds = new DoubleFieldValue(self, Eii.fields.personalHouseholdNeeds) - val healthcare = new DoubleFieldValue(self, Eii.fields.healthcare) - val taxes = new DoubleFieldValue(self, Eii.fields.taxes) - val taxCredits = new DoubleFieldValue(self, Eii.fields.taxCredits) - val monthlyTotal = new DoubleFieldValue(self, Eii.fields.monthlyTotal) - val annualTotal = new DoubleFieldValue(self, Eii.fields.annualTotal) - val hourlyWage = new DoubleFieldValue(self, Eii.fields.hourlyWage) - val precautionary = new DoubleFieldValue(self, Eii.fields.precautionary) - val retirement = new DoubleFieldValue(self, Eii.fields.retirement) - val childrensEducationTraining = new DoubleFieldValue(self, Eii.fields.childrensEducationTraining) - val homeownership = new DoubleFieldValue(self, Eii.fields.homeownership) - val benefits = new StringFieldValue(self, Eii.fields.benefits) - val monthlyTotalTemp = new StringFieldValue(self, Eii.fields.monthlyTotalTemp) - val annualTotalTemp = new StringFieldValue(self, Eii.fields.annualTotalTemp) - val workerCt = new DoubleFieldValue(self, Eii.fields.workerCt) - val infantCt = new DoubleFieldValue(self, Eii.fields.infantCt) - val preschoolerCt = new DoubleFieldValue(self, Eii.fields.preschoolerCt) - val schoolageCt = new DoubleFieldValue(self, Eii.fields.schoolageCt) - val teenageCt = new DoubleFieldValue(self, Eii.fields.teenageCt) - } -} - -object Eii extends StorableObject[Eii] { - override val useRuntimeFieldnamesForJson: Boolean = true - - override val entityName: String = "EII" - - object fields extends FieldsObject { - val id = new IntDatabaseField(self, "ID") - val desc7 = new NullableStringDatabaseField(self, "DESC_7", 30) - val desc6 = new NullableStringDatabaseField(self, "DESC_6", 30) - val desc5 = new NullableStringDatabaseField(self, "DESC_5", 30) - val desc4 = new NullableStringDatabaseField(self, "DESC_4", 30) - val desc3 = new NullableStringDatabaseField(self, "DESC_3", 30) - val desc2 = new NullableStringDatabaseField(self, "DESC_2", 30) - @NullableInDatabase - val desc1 = new StringDatabaseField(self, "DESC_1", 30) - @NullableInDatabase - val housing = new DoubleDatabaseField(self, "HOUSING") - @NullableInDatabase - val utilities = new DoubleDatabaseField(self, "UTILITIES") - @NullableInDatabase - val food = new DoubleDatabaseField(self, "FOOD") - @NullableInDatabase - val transportation = new DoubleDatabaseField(self, "TRANSPORTATION") - @NullableInDatabase - val childCare = new DoubleDatabaseField(self, "CHILD_CARE") - @NullableInDatabase - val personalHouseholdNeeds = new DoubleDatabaseField(self, "PERSONAL_HOUSEHOLD_NEEDS") - @NullableInDatabase - val healthcare = new DoubleDatabaseField(self, "HEALTHCARE") - @NullableInDatabase - val taxes = new DoubleDatabaseField(self, "TAXES") - @NullableInDatabase - val taxCredits = new DoubleDatabaseField(self, "TAX_CREDITS") - @NullableInDatabase - val monthlyTotal = new DoubleDatabaseField(self, "MONTHLY_TOTAL") - @NullableInDatabase - val annualTotal = new DoubleDatabaseField(self, "ANNUAL_TOTAL") - @NullableInDatabase - val hourlyWage = new DoubleDatabaseField(self, "HOURLY_WAGE") - @NullableInDatabase - val precautionary = new DoubleDatabaseField(self, "PRECAUTIONARY") - @NullableInDatabase - val retirement = new DoubleDatabaseField(self, "RETIREMENT") - @NullableInDatabase - val childrensEducationTraining = new DoubleDatabaseField(self, "CHILDRENS_EDUCATION_TRAINING") - @NullableInDatabase - val homeownership = new DoubleDatabaseField(self, "HOMEOWNERSHIP") - @NullableInDatabase - val benefits = new StringDatabaseField(self, "BENEFITS", 30) - @NullableInDatabase - val monthlyTotalTemp = new StringDatabaseField(self, "MONTHLY_TOTAL_TEMP", 50) - @NullableInDatabase - val annualTotalTemp = new StringDatabaseField(self, "ANNUAL_TOTAL_TEMP", 50) - @NullableInDatabase - val workerCt = new DoubleDatabaseField(self, "WORKER_CT") - @NullableInDatabase - val infantCt = new DoubleDatabaseField(self, "INFANT_CT") - @NullableInDatabase - val preschoolerCt = new DoubleDatabaseField(self, "PRESCHOOLER_CT") - @NullableInDatabase - val schoolageCt = new DoubleDatabaseField(self, "SCHOOLAGE_CT") - @NullableInDatabase - val teenageCt = new DoubleDatabaseField(self, "TEENAGE_CT") - } - - def primaryKey: IntDatabaseField = fields.id -} \ No newline at end of file diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala index d9230ea8..3127afd2 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala @@ -11,11 +11,11 @@ import play.api.libs.json._ class EiiMit extends StorableClass(EiiMit) { override object values extends ValuesObject { val rowId = new IntFieldValue(self, EiiMit.fields.rowId) - val adults = new DoubleFieldValue(self, EiiMit.fields.adults) - val children = new DoubleFieldValue(self, EiiMit.fields.children) + val adults = new IntFieldValue(self, EiiMit.fields.adults) + val children = new IntFieldValue(self, EiiMit.fields.children) val eii = new DoubleFieldValue(self, EiiMit.fields.eii) - val generation = new DoubleFieldValue(self, EiiMit.fields.generation) - val nonworkingAdults = new DoubleFieldValue(self, EiiMit.fields.nonworkingAdults) + val generation = new IntFieldValue(self, EiiMit.fields.generation) + val nonworkingAdults = new IntFieldValue(self, EiiMit.fields.nonworkingAdults) } } @@ -27,15 +27,15 @@ object EiiMit extends StorableObject[EiiMit] { object fields extends FieldsObject { val rowId = new IntDatabaseField(self, "ROW_ID") @NullableInDatabase - val adults = new DoubleDatabaseField(self, "ADULTS") + val adults = new IntDatabaseField(self, "ADULTS") @NullableInDatabase - val children = new DoubleDatabaseField(self, "CHILDREN") + val children = new IntDatabaseField(self, "CHILDREN") @NullableInDatabase val eii = new DoubleDatabaseField(self, "EII") @NullableInDatabase - val generation = new DoubleDatabaseField(self, "GENERATION") + val generation = new IntDatabaseField(self, "GENERATION") @NullableInDatabase - val nonworkingAdults = new DoubleDatabaseField(self, "NONWORKING_ADULTS") + val nonworkingAdults = new IntDatabaseField(self, "NONWORKING_ADULTS") } def primaryKey: IntDatabaseField = fields.rowId diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala index 10d93870..0a1b29e4 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala @@ -11,7 +11,7 @@ import play.api.libs.json._ class EiiOverride extends StorableClass(EiiOverride) { override object values extends ValuesObject { val personId = new IntFieldValue(self, EiiOverride.fields.personId) - val season = new DoubleFieldValue(self, EiiOverride.fields.season) + val season = new IntFieldValue(self, EiiOverride.fields.season) val price = new DoubleFieldValue(self, EiiOverride.fields.price) val createdOn = new DateTimeFieldValue(self, EiiOverride.fields.createdOn) val createdBy = new StringFieldValue(self, EiiOverride.fields.createdBy) @@ -30,7 +30,7 @@ object EiiOverride extends StorableObject[EiiOverride] { @NullableInDatabase val personId = new IntDatabaseField(self, "PERSON_ID") @NullableInDatabase - val season = new DoubleDatabaseField(self, "SEASON") + val season = new IntDatabaseField(self, "SEASON") @NullableInDatabase val price = new DoubleDatabaseField(self, "PRICE") @NullableInDatabase diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala index 6f6dcd38..7f70904e 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala @@ -12,13 +12,13 @@ class EiiResponse extends StorableClass(EiiResponse) { override object values extends ValuesObject { val responseId = new IntFieldValue(self, EiiResponse.fields.responseId) val personId = new IntFieldValue(self, EiiResponse.fields.personId) - val season = new DoubleFieldValue(self, EiiResponse.fields.season) - val workers = new NullableDoubleFieldValue(self, EiiResponse.fields.workers) + val season = new IntFieldValue(self, EiiResponse.fields.season) + val workers = new NullableIntFieldValue(self, EiiResponse.fields.workers) val benefits = new NullableBooleanFieldValue(self, EiiResponse.fields.benefits) - val infants = new NullableDoubleFieldValue(self, EiiResponse.fields.infants) - val preschoolers = new NullableDoubleFieldValue(self, EiiResponse.fields.preschoolers) - val schoolagers = new NullableDoubleFieldValue(self, EiiResponse.fields.schoolagers) - val teenagers = new NullableDoubleFieldValue(self, EiiResponse.fields.teenagers) + val infants = new NullableIntFieldValue(self, EiiResponse.fields.infants) + val preschoolers = new NullableIntFieldValue(self, EiiResponse.fields.preschoolers) + val schoolagers = new NullableIntFieldValue(self, EiiResponse.fields.schoolagers) + val teenagers = new NullableIntFieldValue(self, EiiResponse.fields.teenagers) val income = new NullableDoubleFieldValue(self, EiiResponse.fields.income) val computedEii = new NullableDoubleFieldValue(self, EiiResponse.fields.computedEii) val computedPrice = new DoubleFieldValue(self, EiiResponse.fields.computedPrice) @@ -31,8 +31,8 @@ class EiiResponse extends StorableClass(EiiResponse) { val pdComment = new NullableStringFieldValue(self, EiiResponse.fields.pdComment) val status = new NullableStringFieldValue(self, EiiResponse.fields.status) val utilizedInflationFactor = new NullableDoubleFieldValue(self, EiiResponse.fields.utilizedInflationFactor) - val children = new NullableDoubleFieldValue(self, EiiResponse.fields.children) - val nonworkingAdults = new NullableDoubleFieldValue(self, EiiResponse.fields.nonworkingAdults) + val children = new NullableIntFieldValue(self, EiiResponse.fields.children) + val nonworkingAdults = new NullableIntFieldValue(self, EiiResponse.fields.nonworkingAdults) } } @@ -44,13 +44,13 @@ object EiiResponse extends StorableObject[EiiResponse] { object fields extends FieldsObject { val responseId = new IntDatabaseField(self, "RESPONSE_ID") val personId = new IntDatabaseField(self, "PERSON_ID") - val season = new DoubleDatabaseField(self, "SEASON") - val workers = new NullableDoubleDatabaseField(self, "WORKERS") + val season = new IntDatabaseField(self, "SEASON") + val workers = new NullableIntDatabaseField(self, "WORKERS") val benefits = new NullableBooleanDatabaseField(self, "BENEFITS") - val infants = new NullableDoubleDatabaseField(self, "INFANTS") - val preschoolers = new NullableDoubleDatabaseField(self, "PRESCHOOLERS") - val schoolagers = new NullableDoubleDatabaseField(self, "SCHOOLAGERS") - val teenagers = new NullableDoubleDatabaseField(self, "TEENAGERS") + val infants = new NullableIntDatabaseField(self, "INFANTS") + val preschoolers = new NullableIntDatabaseField(self, "PRESCHOOLERS") + val schoolagers = new NullableIntDatabaseField(self, "SCHOOLAGERS") + val teenagers = new NullableIntDatabaseField(self, "TEENAGERS") val income = new NullableDoubleDatabaseField(self, "INCOME") val computedEii = new NullableDoubleDatabaseField(self, "COMPUTED_EII") @NullableInDatabase @@ -67,8 +67,8 @@ object EiiResponse extends StorableObject[EiiResponse] { val pdComment = new NullableStringDatabaseField(self, "PD_COMMENT", -1) val status = new NullableStringDatabaseField(self, "STATUS", 1) val utilizedInflationFactor = new NullableDoubleDatabaseField(self, "UTILIZED_INFLATION_FACTOR") - val children = new NullableDoubleDatabaseField(self, "CHILDREN") - val nonworkingAdults = new NullableDoubleDatabaseField(self, "NONWORKING_ADULTS") + val children = new NullableIntDatabaseField(self, "CHILDREN") + val nonworkingAdults = new NullableIntDatabaseField(self, "NONWORKING_ADULTS") } def primaryKey: IntDatabaseField = fields.responseId diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailTracking.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailTracking.scala index 00e70ee3..003541cf 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailTracking.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailTracking.scala @@ -25,7 +25,7 @@ class EmailTracking extends StorableClass(EmailTracking) { val updatedBy = new NullableStringFieldValue(self, EmailTracking.fields.updatedBy) val status = new NullableStringFieldValue(self, EmailTracking.fields.status) val sendgridJson = new NullableStringFieldValue(self, EmailTracking.fields.sendgridJson) - val retryCt = new NullableDoubleFieldValue(self, EmailTracking.fields.retryCt) + val retryCt = new NullableIntFieldValue(self, EmailTracking.fields.retryCt) val emailFromAddrName = new NullableStringFieldValue(self, EmailTracking.fields.emailFromAddrName) val emailFromAddrOnly = new NullableStringFieldValue(self, EmailTracking.fields.emailFromAddrOnly) val optOutGrpId = new NullableIntFieldValue(self, EmailTracking.fields.optOutGrpId) @@ -59,7 +59,7 @@ object EmailTracking extends StorableObject[EmailTracking] { val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500) val status = new NullableStringDatabaseField(self, "STATUS", 1) val sendgridJson = new NullableStringDatabaseField(self, "SENDGRID_JSON", -1) - val retryCt = new NullableDoubleDatabaseField(self, "RETRY_CT") + val retryCt = new NullableIntDatabaseField(self, "RETRY_CT") val emailFromAddrName = new NullableStringDatabaseField(self, "EMAIL_FROM_ADDR_NAME", 100) val emailFromAddrOnly = new NullableStringDatabaseField(self, "EMAIL_FROM_ADDR_ONLY", 100) val optOutGrpId = new NullableIntDatabaseField(self, "OPT_OUT_GRP_ID") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala index c6f205a2..c4899a73 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala @@ -12,7 +12,7 @@ class ErrorType extends StorableClass(ErrorType) { override object values extends ValuesObject { val typeId = new IntFieldValue(self, ErrorType.fields.typeId) val errorMessage = new NullableStringFieldValue(self, ErrorType.fields.errorMessage) - val throwCount = new NullableDoubleFieldValue(self, ErrorType.fields.throwCount) + val throwCount = new NullableIntFieldValue(self, ErrorType.fields.throwCount) val lastInstance = new NullableDateTimeFieldValue(self, ErrorType.fields.lastInstance) } } @@ -25,7 +25,7 @@ object ErrorType extends StorableObject[ErrorType] { object fields extends FieldsObject { val typeId = new IntDatabaseField(self, "TYPE_ID") val errorMessage = new NullableStringDatabaseField(self, "ERROR_MESSAGE", 4000) - val throwCount = new NullableDoubleDatabaseField(self, "THROW_COUNT") + val throwCount = new NullableIntDatabaseField(self, "THROW_COUNT") val lastInstance = new NullableDateTimeDatabaseField(self, "LAST_INSTANCE") } diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala index c357fb1f..cb29d936 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala @@ -17,7 +17,7 @@ class FlagChange extends StorableClass(FlagChange) { val createdBy = new NullableStringFieldValue(self, FlagChange.fields.createdBy) val updatedOn = new NullableDateTimeFieldValue(self, FlagChange.fields.updatedOn) val updatedBy = new NullableStringFieldValue(self, FlagChange.fields.updatedBy) - val notificationsSent = new NullableDoubleFieldValue(self, FlagChange.fields.notificationsSent) + val notificationsSent = new NullableIntFieldValue(self, FlagChange.fields.notificationsSent) } } @@ -34,7 +34,7 @@ object FlagChange extends StorableObject[FlagChange] { val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500) val updatedOn = new NullableDateTimeDatabaseField(self, "UPDATED_ON") val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500) - val notificationsSent = new NullableDoubleDatabaseField(self, "NOTIFICATIONS_SENT") + val notificationsSent = new NullableIntDatabaseField(self, "NOTIFICATIONS_SENT") } def primaryKey: IntDatabaseField = fields.changeId diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala index 1f79c8d3..69e038bc 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala @@ -12,13 +12,13 @@ class FoCash extends StorableClass(FoCash) { override object values extends ValuesObject { val cashId = new IntFieldValue(self, FoCash.fields.cashId) val closeId = new IntFieldValue(self, FoCash.fields.closeId) - val locationIndex = new DoubleFieldValue(self, FoCash.fields.locationIndex) + val locationIndex = new IntFieldValue(self, FoCash.fields.locationIndex) val value = new DoubleFieldValue(self, FoCash.fields.value) val createdOn = new DateTimeFieldValue(self, FoCash.fields.createdOn) val createdBy = new StringFieldValue(self, FoCash.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, FoCash.fields.updatedOn) val updatedBy = new StringFieldValue(self, FoCash.fields.updatedBy) - val denomIndex = new DoubleFieldValue(self, FoCash.fields.denomIndex) + val denomIndex = new IntFieldValue(self, FoCash.fields.denomIndex) } } @@ -30,7 +30,7 @@ object FoCash extends StorableObject[FoCash] { object fields extends FieldsObject { val cashId = new IntDatabaseField(self, "CASH_ID") val closeId = new IntDatabaseField(self, "CLOSE_ID") - val locationIndex = new DoubleDatabaseField(self, "LOCATION_INDEX") + val locationIndex = new IntDatabaseField(self, "LOCATION_INDEX") val value = new DoubleDatabaseField(self, "VALUE") @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") @@ -40,7 +40,7 @@ object FoCash extends StorableObject[FoCash] { val updatedOn = new DateTimeDatabaseField(self, "UPDATED_ON") @NullableInDatabase val updatedBy = new StringDatabaseField(self, "UPDATED_BY", 500) - val denomIndex = new DoubleDatabaseField(self, "DENOM_INDEX") + val denomIndex = new IntDatabaseField(self, "DENOM_INDEX") } def primaryKey: IntDatabaseField = fields.cashId diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala index becb1cb0..8422005e 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala @@ -23,7 +23,7 @@ class FoClose extends StorableClass(FoClose) { val closed = new NullableBooleanFieldValue(self, FoClose.fields.closed) val tapeValue = new NullableDoubleFieldValue(self, FoClose.fields.tapeValue) val notes = new NullableStringFieldValue(self, FoClose.fields.notes) - val finalizedBy = new NullableDoubleFieldValue(self, FoClose.fields.finalizedBy) + val finalizedBy = new NullableIntFieldValue(self, FoClose.fields.finalizedBy) val closeAlias = new NullableStringFieldValue(self, FoClose.fields.closeAlias) val tallyValueAtClose = new NullableDoubleFieldValue(self, FoClose.fields.tallyValueAtClose) val nextSettleReminderSent = new NullableDateTimeFieldValue(self, FoClose.fields.nextSettleReminderSent) @@ -55,7 +55,7 @@ object FoClose extends StorableObject[FoClose] { val closed = new NullableBooleanDatabaseField(self, "CLOSED") val tapeValue = new NullableDoubleDatabaseField(self, "TAPE_VALUE") val notes = new NullableStringDatabaseField(self, "NOTES", -1) - val finalizedBy = new NullableDoubleDatabaseField(self, "FINALIZED_BY") + val finalizedBy = new NullableIntDatabaseField(self, "FINALIZED_BY") val closeAlias = new NullableStringDatabaseField(self, "CLOSE_ALIAS", 100) val tallyValueAtClose = new NullableDoubleDatabaseField(self, "TALLY_VALUE_AT_CLOSE") val nextSettleReminderSent = new NullableDateTimeDatabaseField(self, "NEXT_SETTLE_REMINDER_SENT") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala index e70ec238..51f65946 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala @@ -15,8 +15,8 @@ class FoItem extends StorableClass(FoItem) { val closeId = new IntFieldValue(self, FoItem.fields.closeId) val unitPrice = new DoubleFieldValue(self, FoItem.fields.unitPrice) val discountsTotal = new DoubleFieldValue(self, FoItem.fields.discountsTotal) - val qtySold = new DoubleFieldValue(self, FoItem.fields.qtySold) - val qtyComped = new DoubleFieldValue(self, FoItem.fields.qtyComped) + val qtySold = new IntFieldValue(self, FoItem.fields.qtySold) + val qtyComped = new IntFieldValue(self, FoItem.fields.qtyComped) val createdOn = new DateTimeFieldValue(self, FoItem.fields.createdOn) val createdBy = new StringFieldValue(self, FoItem.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, FoItem.fields.updatedOn) @@ -41,9 +41,9 @@ object FoItem extends StorableObject[FoItem] { @NullableInDatabase val discountsTotal = new DoubleDatabaseField(self, "DISCOUNTS_TOTAL") @NullableInDatabase - val qtySold = new DoubleDatabaseField(self, "QTY_SOLD") + val qtySold = new IntDatabaseField(self, "QTY_SOLD") @NullableInDatabase - val qtyComped = new DoubleDatabaseField(self, "QTY_COMPED") + val qtyComped = new IntDatabaseField(self, "QTY_COMPED") @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") @NullableInDatabase diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala index a88d1271..26a06afd 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala @@ -14,8 +14,8 @@ class FoItemType extends StorableClass(FoItemType) { val typeId = new IntFieldValue(self, FoItemType.fields.typeId) val closeId = new IntFieldValue(self, FoItemType.fields.closeId) val discountsTotal = new DoubleFieldValue(self, FoItemType.fields.discountsTotal) - val qtySold = new DoubleFieldValue(self, FoItemType.fields.qtySold) - val qtyComped = new DoubleFieldValue(self, FoItemType.fields.qtyComped) + val qtySold = new IntFieldValue(self, FoItemType.fields.qtySold) + val qtyComped = new IntFieldValue(self, FoItemType.fields.qtyComped) val createdOn = new DateTimeFieldValue(self, FoItemType.fields.createdOn) val createdBy = new StringFieldValue(self, FoItemType.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, FoItemType.fields.updatedOn) @@ -39,9 +39,9 @@ object FoItemType extends StorableObject[FoItemType] { @NullableInDatabase val discountsTotal = new DoubleDatabaseField(self, "DISCOUNTS_TOTAL") @NullableInDatabase - val qtySold = new DoubleDatabaseField(self, "QTY_SOLD") + val qtySold = new IntDatabaseField(self, "QTY_SOLD") @NullableInDatabase - val qtyComped = new DoubleDatabaseField(self, "QTY_COMPED") + val qtyComped = new IntDatabaseField(self, "QTY_COMPED") @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") @NullableInDatabase diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala index 46cfb695..a067e5ac 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala @@ -13,13 +13,13 @@ class FoMisc extends StorableClass(FoMisc) { val rowId = new IntFieldValue(self, FoMisc.fields.rowId) val itemId = new IntFieldValue(self, FoMisc.fields.itemId) val closeId = new IntFieldValue(self, FoMisc.fields.closeId) - val qtySold = new DoubleFieldValue(self, FoMisc.fields.qtySold) + val qtySold = new IntFieldValue(self, FoMisc.fields.qtySold) val totalPrice = new DoubleFieldValue(self, FoMisc.fields.totalPrice) val createdOn = new DateTimeFieldValue(self, FoMisc.fields.createdOn) val createdBy = new StringFieldValue(self, FoMisc.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, FoMisc.fields.updatedOn) val updatedBy = new StringFieldValue(self, FoMisc.fields.updatedBy) - val qtyComped = new DoubleFieldValue(self, FoMisc.fields.qtyComped) + val qtyComped = new IntFieldValue(self, FoMisc.fields.qtyComped) val totalComp = new DoubleFieldValue(self, FoMisc.fields.totalComp) val taxRate = new NullableDoubleFieldValue(self, FoMisc.fields.taxRate) val totalPretax = new NullableDoubleFieldValue(self, FoMisc.fields.totalPretax) @@ -38,7 +38,7 @@ object FoMisc extends StorableObject[FoMisc] { @NullableInDatabase val closeId = new IntDatabaseField(self, "CLOSE_ID") @NullableInDatabase - val qtySold = new DoubleDatabaseField(self, "QTY_SOLD") + val qtySold = new IntDatabaseField(self, "QTY_SOLD") @NullableInDatabase val totalPrice = new DoubleDatabaseField(self, "TOTAL_PRICE") @NullableInDatabase @@ -50,7 +50,7 @@ object FoMisc extends StorableObject[FoMisc] { @NullableInDatabase val updatedBy = new StringDatabaseField(self, "UPDATED_BY", 500) @NullableInDatabase - val qtyComped = new DoubleDatabaseField(self, "QTY_COMPED") + val qtyComped = new IntDatabaseField(self, "QTY_COMPED") @NullableInDatabase val totalComp = new DoubleDatabaseField(self, "TOTAL_COMP") val taxRate = new NullableDoubleDatabaseField(self, "TAX_RATE") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala index c0b93741..f1028fcb 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala @@ -11,14 +11,14 @@ import play.api.libs.json._ class FoParking extends StorableClass(FoParking) { override object values extends ValuesObject { val closeId = new IntFieldValue(self, FoParking.fields.closeId) - val openCt = new NullableDoubleFieldValue(self, FoParking.fields.openCt) - val closeCt = new NullableDoubleFieldValue(self, FoParking.fields.closeCt) - val changeCt = new NullableDoubleFieldValue(self, FoParking.fields.changeCt) + val openCt = new NullableIntFieldValue(self, FoParking.fields.openCt) + val closeCt = new NullableIntFieldValue(self, FoParking.fields.closeCt) + val changeCt = new NullableIntFieldValue(self, FoParking.fields.changeCt) val createdOn = new DateTimeFieldValue(self, FoParking.fields.createdOn) val createdBy = new StringFieldValue(self, FoParking.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, FoParking.fields.updatedOn) val updatedBy = new StringFieldValue(self, FoParking.fields.updatedBy) - val compCt = new NullableDoubleFieldValue(self, FoParking.fields.compCt) + val compCt = new NullableIntFieldValue(self, FoParking.fields.compCt) val unitPrice = new DoubleFieldValue(self, FoParking.fields.unitPrice) } } @@ -30,9 +30,9 @@ object FoParking extends StorableObject[FoParking] { object fields extends FieldsObject { val closeId = new IntDatabaseField(self, "CLOSE_ID") - val openCt = new NullableDoubleDatabaseField(self, "OPEN_CT") - val closeCt = new NullableDoubleDatabaseField(self, "CLOSE_CT") - val changeCt = new NullableDoubleDatabaseField(self, "CHANGE_CT") + val openCt = new NullableIntDatabaseField(self, "OPEN_CT") + val closeCt = new NullableIntDatabaseField(self, "CLOSE_CT") + val changeCt = new NullableIntDatabaseField(self, "CHANGE_CT") @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") @NullableInDatabase @@ -41,7 +41,7 @@ object FoParking extends StorableObject[FoParking] { val updatedOn = new DateTimeDatabaseField(self, "UPDATED_ON") @NullableInDatabase val updatedBy = new StringDatabaseField(self, "UPDATED_BY", 500) - val compCt = new NullableDoubleDatabaseField(self, "COMP_CT") + val compCt = new NullableIntDatabaseField(self, "COMP_CT") val unitPrice = new DoubleDatabaseField(self, "UNIT_PRICE") } diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoRegCode.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoRegCode.scala deleted file mode 100644 index 7894c932..00000000 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoRegCode.scala +++ /dev/null @@ -1,42 +0,0 @@ -package org.sailcbi.APIServer.Entities.EntityDefinitions - -import com.coleji.neptune.Storable.FieldValues._ -import com.coleji.neptune.Storable.Fields._ -import com.coleji.neptune.Storable._ -import com.coleji.neptune.Util._ -import org.sailcbi.APIServer.Entities.NullableInDatabase -import org.sailcbi.APIServer.Entities.entitycalculations._ -import play.api.libs.json._ - -class FoRegCode extends StorableClass(FoRegCode) { - override object values extends ValuesObject { - val code = new NullableDoubleFieldValue(self, FoRegCode.fields.code) - val description = new NullableStringFieldValue(self, FoRegCode.fields.description) - val createdOn = new NullableDateTimeFieldValue(self, FoRegCode.fields.createdOn) - val createdBy = new NullableStringFieldValue(self, FoRegCode.fields.createdBy) - val updatedOn = new DateTimeFieldValue(self, FoRegCode.fields.updatedOn) - val updatedBy = new NullableStringFieldValue(self, FoRegCode.fields.updatedBy) - val active = new NullableBooleanFieldValue(self, FoRegCode.fields.active) - val rowId = new IntFieldValue(self, FoRegCode.fields.rowId) - } -} - -object FoRegCode extends StorableObject[FoRegCode] { - override val useRuntimeFieldnamesForJson: Boolean = true - - override val entityName: String = "FO_REG_CODES" - - object fields extends FieldsObject { - val code = new NullableDoubleDatabaseField(self, "CODE") - val description = new NullableStringDatabaseField(self, "DESCRIPTION", 200) - val createdOn = new NullableDateTimeDatabaseField(self, "CREATED_ON") - val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500) - @NullableInDatabase - val updatedOn = new DateTimeDatabaseField(self, "UPDATED_ON") - val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500) - val active = new NullableBooleanDatabaseField(self, "ACTIVE") - val rowId = new IntDatabaseField(self, "ROW_ID") - } - - def primaryKey: IntDatabaseField = fields.rowId -} \ No newline at end of file diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstant.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstant.scala index 86471d6d..b76ed217 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstant.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GlobalConstant.scala @@ -12,7 +12,7 @@ class GlobalConstant extends StorableClass(GlobalConstant) { override object values extends ValuesObject { val constantId = new IntFieldValue(self, GlobalConstant.fields.constantId) val constantName = new StringFieldValue(self, GlobalConstant.fields.constantName) - val dataType = new DoubleFieldValue(self, GlobalConstant.fields.dataType) + val dataType = new IntFieldValue(self, GlobalConstant.fields.dataType) val createdOn = new NullableDateTimeFieldValue(self, GlobalConstant.fields.createdOn) val createdBy = new NullableStringFieldValue(self, GlobalConstant.fields.createdBy) val updatedOn = new NullableDateTimeFieldValue(self, GlobalConstant.fields.updatedOn) @@ -28,7 +28,7 @@ object GlobalConstant extends StorableObject[GlobalConstant] { object fields extends FieldsObject { val constantId = new IntDatabaseField(self, "CONSTANT_ID") val constantName = new StringDatabaseField(self, "CONSTANT_NAME", 100) - val dataType = new DoubleDatabaseField(self, "DATA_TYPE") + val dataType = new IntDatabaseField(self, "DATA_TYPE") val createdOn = new NullableDateTimeDatabaseField(self, "CREATED_ON") val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500) val updatedOn = new NullableDateTimeDatabaseField(self, "UPDATED_ON") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolFee.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolFee.scala index 2a3b1a72..4484e577 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolFee.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolFee.scala @@ -12,7 +12,7 @@ class HighSchoolFee extends StorableClass(HighSchoolFee) { override object values extends ValuesObject { val rowId = new IntFieldValue(self, HighSchoolFee.fields.rowId) val schoolId = new IntFieldValue(self, HighSchoolFee.fields.schoolId) - val year = new DoubleFieldValue(self, HighSchoolFee.fields.year) + val year = new IntFieldValue(self, HighSchoolFee.fields.year) val springFall = new StringFieldValue(self, HighSchoolFee.fields.springFall) val amount = new DoubleFieldValue(self, HighSchoolFee.fields.amount) val closeId = new IntFieldValue(self, HighSchoolFee.fields.closeId) @@ -32,7 +32,7 @@ object HighSchoolFee extends StorableObject[HighSchoolFee] { object fields extends FieldsObject { val rowId = new IntDatabaseField(self, "ROW_ID") val schoolId = new IntDatabaseField(self, "SCHOOL_ID") - val year = new DoubleDatabaseField(self, "YEAR") + val year = new IntDatabaseField(self, "YEAR") val springFall = new StringDatabaseField(self, "SPRING_FALL", 1) @NullableInDatabase val amount = new DoubleDatabaseField(self, "AMOUNT") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolPayment.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolPayment.scala index 8e328c84..889313f1 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolPayment.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchoolPayment.scala @@ -23,7 +23,7 @@ class HighSchoolPayment extends StorableClass(HighSchoolPayment) { val ccTransNum = new NullableDoubleFieldValue(self, HighSchoolPayment.fields.ccTransNum) val checkId = new IntFieldValue(self, HighSchoolPayment.fields.checkId) val springFall = new StringFieldValue(self, HighSchoolPayment.fields.springFall) - val year = new DoubleFieldValue(self, HighSchoolPayment.fields.year) + val year = new IntFieldValue(self, HighSchoolPayment.fields.year) } } @@ -47,7 +47,7 @@ object HighSchoolPayment extends StorableObject[HighSchoolPayment] { @NullableInDatabase val checkId = new IntDatabaseField(self, "CHECK_ID") val springFall = new StringDatabaseField(self, "SPRING_FALL", 1) - val year = new DoubleDatabaseField(self, "YEAR") + val year = new IntDatabaseField(self, "YEAR") } def primaryKey: IntDatabaseField = fields.paymentId diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/IncomeLevel.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/IncomeLevel.scala deleted file mode 100644 index b4890e1b..00000000 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/IncomeLevel.scala +++ /dev/null @@ -1,43 +0,0 @@ -package org.sailcbi.APIServer.Entities.EntityDefinitions - -import com.coleji.neptune.Storable.FieldValues._ -import com.coleji.neptune.Storable.Fields._ -import com.coleji.neptune.Storable._ -import com.coleji.neptune.Util._ -import org.sailcbi.APIServer.Entities.NullableInDatabase -import org.sailcbi.APIServer.Entities.entitycalculations._ -import play.api.libs.json._ - -class IncomeLevel extends StorableClass(IncomeLevel) { - override object values extends ValuesObject { - val levelId = new IntFieldValue(self, IncomeLevel.fields.levelId) - val levelFloor = new NullableDoubleFieldValue(self, IncomeLevel.fields.levelFloor) - val levelCeiling = new NullableDoubleFieldValue(self, IncomeLevel.fields.levelCeiling) - val createdOn = new DateTimeFieldValue(self, IncomeLevel.fields.createdOn) - val createdBy = new StringFieldValue(self, IncomeLevel.fields.createdBy) - val updatedOn = new DateTimeFieldValue(self, IncomeLevel.fields.updatedOn) - val updatedBy = new StringFieldValue(self, IncomeLevel.fields.updatedBy) - } -} - -object IncomeLevel extends StorableObject[IncomeLevel] { - override val useRuntimeFieldnamesForJson: Boolean = true - - override val entityName: String = "INCOME_LEVELS" - - object fields extends FieldsObject { - val levelId = new IntDatabaseField(self, "LEVEL_ID") - val levelFloor = new NullableDoubleDatabaseField(self, "LEVEL_FLOOR") - val levelCeiling = new NullableDoubleDatabaseField(self, "LEVEL_CEILING") - @NullableInDatabase - val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") - @NullableInDatabase - val createdBy = new StringDatabaseField(self, "CREATED_BY", 500) - @NullableInDatabase - val updatedOn = new DateTimeDatabaseField(self, "UPDATED_ON") - @NullableInDatabase - val updatedBy = new StringDatabaseField(self, "UPDATED_BY", 500) - } - - def primaryKey: IntDatabaseField = fields.levelId -} \ No newline at end of file diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/IndiegogoDonation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/IndiegogoDonation.scala deleted file mode 100644 index 32495500..00000000 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/IndiegogoDonation.scala +++ /dev/null @@ -1,65 +0,0 @@ -package org.sailcbi.APIServer.Entities.EntityDefinitions - -import com.coleji.neptune.Storable.FieldValues._ -import com.coleji.neptune.Storable.Fields._ -import com.coleji.neptune.Storable._ -import com.coleji.neptune.Util._ -import org.sailcbi.APIServer.Entities.NullableInDatabase -import org.sailcbi.APIServer.Entities.entitycalculations._ -import play.api.libs.json._ - -class IndiegogoDonation extends StorableClass(IndiegogoDonation) { - override object values extends ValuesObject { - val id = new IntFieldValue(self, IndiegogoDonation.fields.id) - val perkId = new NullableStringFieldValue(self, IndiegogoDonation.fields.perkId) - val pledgeId = new NullableIntFieldValue(self, IndiegogoDonation.fields.pledgeId) - val fulfillmentStatus = new NullableStringFieldValue(self, IndiegogoDonation.fields.fulfillmentStatus) - val fundingDate = new NullableStringFieldValue(self, IndiegogoDonation.fields.fundingDate) - val paymentMethod = new NullableStringFieldValue(self, IndiegogoDonation.fields.paymentMethod) - val appearance = new NullableStringFieldValue(self, IndiegogoDonation.fields.appearance) - val name = new NullableStringFieldValue(self, IndiegogoDonation.fields.name) - val email = new NullableStringFieldValue(self, IndiegogoDonation.fields.email) - val amount = new NullableStringFieldValue(self, IndiegogoDonation.fields.amount) - val perk = new NullableStringFieldValue(self, IndiegogoDonation.fields.perk) - val shippingName = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingName) - val shippingAddress = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingAddress) - val shippingAddress2 = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingAddress2) - val shippingCity = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingCity) - val shippingStateprovince = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingStateprovince) - val shippingZippostalCode = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingZippostalCode) - val shippingCountry = new NullableStringFieldValue(self, IndiegogoDonation.fields.shippingCountry) - val amountNumeric = new NullableDoubleFieldValue(self, IndiegogoDonation.fields.amountNumeric) - val instance = new DoubleFieldValue(self, IndiegogoDonation.fields.instance) - } -} - -object IndiegogoDonation extends StorableObject[IndiegogoDonation] { - override val useRuntimeFieldnamesForJson: Boolean = true - - override val entityName: String = "INDIEGOGO_DONATIONS" - - object fields extends FieldsObject { - val id = new IntDatabaseField(self, "ID") - val perkId = new NullableStringDatabaseField(self, "PERK_ID", 30) - val pledgeId = new NullableIntDatabaseField(self, "PLEDGE_ID") - val fulfillmentStatus = new NullableStringDatabaseField(self, "FULFILLMENT_STATUS", 60) - val fundingDate = new NullableStringDatabaseField(self, "FUNDING_DATE", 30) - val paymentMethod = new NullableStringDatabaseField(self, "PAYMENT_METHOD", 30) - val appearance = new NullableStringDatabaseField(self, "APPEARANCE", 30) - val name = new NullableStringDatabaseField(self, "NAME", 1) - val email = new NullableStringDatabaseField(self, "EMAIL", 255) - val amount = new NullableStringDatabaseField(self, "AMOUNT", 30) - val perk = new NullableStringDatabaseField(self, "PERK", 255) - val shippingName = new NullableStringDatabaseField(self, "SHIPPING_NAME", 30) - val shippingAddress = new NullableStringDatabaseField(self, "SHIPPING_ADDRESS", 255) - val shippingAddress2 = new NullableStringDatabaseField(self, "SHIPPING_ADDRESS_2", 30) - val shippingCity = new NullableStringDatabaseField(self, "SHIPPING_CITY", 30) - val shippingStateprovince = new NullableStringDatabaseField(self, "SHIPPING_STATEPROVINCE", 30) - val shippingZippostalCode = new NullableStringDatabaseField(self, "SHIPPING_ZIPPOSTAL_CODE", 30) - val shippingCountry = new NullableStringDatabaseField(self, "SHIPPING_COUNTRY", 30) - val amountNumeric = new NullableDoubleDatabaseField(self, "AMOUNT_NUMERIC") - val instance = new DoubleDatabaseField(self, "INSTANCE") - } - - def primaryKey: IntDatabaseField = fields.id -} \ No newline at end of file diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstallmentSale.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstallmentSale.scala index 62801ce2..07921d16 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstallmentSale.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstallmentSale.scala @@ -11,7 +11,7 @@ import play.api.libs.json._ class InstallmentSale extends StorableClass(InstallmentSale) { override object values extends ValuesObject { val saleId = new IntFieldValue(self, InstallmentSale.fields.saleId) - val amountInCents = new DoubleFieldValue(self, InstallmentSale.fields.amountInCents) + val amountInCents = new IntFieldValue(self, InstallmentSale.fields.amountInCents) val staggerId = new IntFieldValue(self, InstallmentSale.fields.staggerId) val closeId = new IntFieldValue(self, InstallmentSale.fields.closeId) val voidCloseId = new NullableIntFieldValue(self, InstallmentSale.fields.voidCloseId) @@ -25,7 +25,7 @@ object InstallmentSale extends StorableObject[InstallmentSale] { object fields extends FieldsObject { val saleId = new IntDatabaseField(self, "SALE_ID") - val amountInCents = new DoubleDatabaseField(self, "AMOUNT_IN_CENTS") + val amountInCents = new IntDatabaseField(self, "AMOUNT_IN_CENTS") val staggerId = new IntDatabaseField(self, "STAGGER_ID") val closeId = new IntDatabaseField(self, "CLOSE_ID") val voidCloseId = new NullableIntDatabaseField(self, "VOID_CLOSE_ID") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstructionQueue.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstructionQueue.scala index d6a617eb..cf01e81f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstructionQueue.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/InstructionQueue.scala @@ -19,7 +19,7 @@ class InstructionQueue extends StorableClass(InstructionQueue) { val updatedOn = new DateTimeFieldValue(self, InstructionQueue.fields.updatedOn) val updatedBy = new StringFieldValue(self, InstructionQueue.fields.updatedBy) val programId = new IntFieldValue(self, InstructionQueue.fields.programId) - val queueOrder = new DoubleFieldValue(self, InstructionQueue.fields.queueOrder) + val queueOrder = new IntFieldValue(self, InstructionQueue.fields.queueOrder) val personId = new IntFieldValue(self, InstructionQueue.fields.personId) val startActive = new NullableDateTimeFieldValue(self, InstructionQueue.fields.startActive) val endActive = new NullableDateTimeFieldValue(self, InstructionQueue.fields.endActive) @@ -47,7 +47,7 @@ object InstructionQueue extends StorableObject[InstructionQueue] { val updatedBy = new StringDatabaseField(self, "UPDATED_BY", 500) val programId = new IntDatabaseField(self, "PROGRAM_ID") @NullableInDatabase - val queueOrder = new DoubleDatabaseField(self, "QUEUE_ORDER") + val queueOrder = new IntDatabaseField(self, "QUEUE_ORDER") val personId = new IntDatabaseField(self, "PERSON_ID") val startActive = new NullableDateTimeDatabaseField(self, "START_ACTIVE") val endActive = new NullableDateTimeDatabaseField(self, "END_ACTIVE") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassInstance.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassInstance.scala index 2adcb618..aa4facee 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassInstance.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassInstance.scala @@ -27,14 +27,14 @@ class JpClassInstance extends StorableClass(JpClassInstance) { override object values extends ValuesObject { val instanceId = new IntFieldValue(self, JpClassInstance.fields.instanceId) val typeId = new IntFieldValue(self, JpClassInstance.fields.typeId) - val limitOverride = new NullableDoubleFieldValue(self, JpClassInstance.fields.limitOverride) + val limitOverride = new NullableIntFieldValue(self, JpClassInstance.fields.limitOverride) val nameOverride = new NullableStringFieldValue(self, JpClassInstance.fields.nameOverride) - val maxAge = new NullableDoubleFieldValue(self, JpClassInstance.fields.maxAge) + val maxAge = new NullableIntFieldValue(self, JpClassInstance.fields.maxAge) val createdOn = new DateTimeFieldValue(self, JpClassInstance.fields.createdOn) val createdBy = new NullableStringFieldValue(self, JpClassInstance.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, JpClassInstance.fields.updatedOn) val updatedBy = new NullableStringFieldValue(self, JpClassInstance.fields.updatedBy) - val minAge = new NullableDoubleFieldValue(self, JpClassInstance.fields.minAge) + val minAge = new NullableIntFieldValue(self, JpClassInstance.fields.minAge) val price = new NullableDoubleFieldValue(self, JpClassInstance.fields.price) val regCodeRowId = new NullableIntFieldValue(self, JpClassInstance.fields.regCodeRowId) val confirmTemplate = new NullableStringFieldValue(self, JpClassInstance.fields.confirmTemplate) @@ -54,16 +54,16 @@ object JpClassInstance extends StorableObject[JpClassInstance] { object fields extends FieldsObject { val instanceId = new IntDatabaseField(self, "INSTANCE_ID") val typeId = new IntDatabaseField(self, "TYPE_ID") - val limitOverride = new NullableDoubleDatabaseField(self, "LIMIT_OVERRIDE") + val limitOverride = new NullableIntDatabaseField(self, "LIMIT_OVERRIDE") val nameOverride = new NullableStringDatabaseField(self, "NAME_OVERRIDE", 200) - val maxAge = new NullableDoubleDatabaseField(self, "MAX_AGE") + val maxAge = new NullableIntDatabaseField(self, "MAX_AGE") @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500) @NullableInDatabase val updatedOn = new DateTimeDatabaseField(self, "UPDATED_ON") val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500) - val minAge = new NullableDoubleDatabaseField(self, "MIN_AGE") + val minAge = new NullableIntDatabaseField(self, "MIN_AGE") val price = new NullableDoubleDatabaseField(self, "PRICE") val regCodeRowId = new NullableIntDatabaseField(self, "REG_CODE_ROW_ID") val confirmTemplate = new NullableStringDatabaseField(self, "CONFIRM_TEMPLATE", 100) diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassStagger.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassStagger.scala index 3a145a2f..1db6495f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassStagger.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassStagger.scala @@ -17,7 +17,7 @@ class JpClassStagger extends StorableClass(JpClassStagger) { val staggerId = new IntFieldValue(self, JpClassStagger.fields.staggerId) val instanceId = new IntFieldValue(self, JpClassStagger.fields.instanceId) val staggerDate = new DateTimeFieldValue(self, JpClassStagger.fields.staggerDate) - val occupancy = new DoubleFieldValue(self, JpClassStagger.fields.occupancy) + val occupancy = new IntFieldValue(self, JpClassStagger.fields.occupancy) val createdOn = new DateTimeFieldValue(self, JpClassStagger.fields.createdOn) val createdBy = new NullableStringFieldValue(self, JpClassStagger.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, JpClassStagger.fields.updatedOn) @@ -36,7 +36,7 @@ object JpClassStagger extends StorableObject[JpClassStagger] { val staggerId = new IntDatabaseField(self, "STAGGER_ID") val instanceId = new IntDatabaseField(self, "INSTANCE_ID") val staggerDate = new DateTimeDatabaseField(self, "STAGGER_DATE") - val occupancy = new DoubleDatabaseField(self, "OCCUPANCY") + val occupancy = new IntDatabaseField(self, "OCCUPANCY") @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500) diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala index d0868e77..fae72a5b 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala @@ -12,19 +12,19 @@ class JpClassType extends StorableClass(JpClassType) { override object values extends ValuesObject { val typeId = new IntFieldValue(self, JpClassType.fields.typeId) val typeName = new StringFieldValue(self, JpClassType.fields.typeName) - val signupMax = new DoubleFieldValue(self, JpClassType.fields.signupMax) + val signupMax = new IntFieldValue(self, JpClassType.fields.signupMax) val allowMultiple = new NullableBooleanFieldValue(self, JpClassType.fields.allowMultiple) - val ratingPrereq = new NullableDoubleFieldValue(self, JpClassType.fields.ratingPrereq) + val ratingPrereq = new NullableIntFieldValue(self, JpClassType.fields.ratingPrereq) val createdOn = new DateTimeFieldValue(self, JpClassType.fields.createdOn) val createdBy = new NullableStringFieldValue(self, JpClassType.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, JpClassType.fields.updatedOn) val updatedBy = new StringFieldValue(self, JpClassType.fields.updatedBy) val sessionLength = new DoubleFieldValue(self, JpClassType.fields.sessionLength) - val sessionCt = new DoubleFieldValue(self, JpClassType.fields.sessionCt) - val ratingOverkill = new NullableDoubleFieldValue(self, JpClassType.fields.ratingOverkill) - val minAge = new NullableDoubleFieldValue(self, JpClassType.fields.minAge) - val maxAge = new NullableDoubleFieldValue(self, JpClassType.fields.maxAge) - val minSessionsForAttended = new DoubleFieldValue(self, JpClassType.fields.minSessionsForAttended) + val sessionCt = new IntFieldValue(self, JpClassType.fields.sessionCt) + val ratingOverkill = new NullableIntFieldValue(self, JpClassType.fields.ratingOverkill) + val minAge = new NullableIntFieldValue(self, JpClassType.fields.minAge) + val maxAge = new NullableIntFieldValue(self, JpClassType.fields.maxAge) + val minSessionsForAttended = new IntFieldValue(self, JpClassType.fields.minSessionsForAttended) val active = new NullableBooleanFieldValue(self, JpClassType.fields.active) val displayOrder = new NullableDoubleFieldValue(self, JpClassType.fields.displayOrder) val noLimit = new NullableBooleanFieldValue(self, JpClassType.fields.noLimit) @@ -41,9 +41,9 @@ object JpClassType extends StorableObject[JpClassType] { @NullableInDatabase val typeName = new StringDatabaseField(self, "TYPE_NAME", 100) @NullableInDatabase - val signupMax = new DoubleDatabaseField(self, "SIGNUP_MAX") + val signupMax = new IntDatabaseField(self, "SIGNUP_MAX") val allowMultiple = new NullableBooleanDatabaseField(self, "ALLOW_MULTIPLE") - val ratingPrereq = new NullableDoubleDatabaseField(self, "RATING_PREREQ") + val ratingPrereq = new NullableIntDatabaseField(self, "RATING_PREREQ") @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500) @@ -54,12 +54,12 @@ object JpClassType extends StorableObject[JpClassType] { @NullableInDatabase val sessionLength = new DoubleDatabaseField(self, "SESSION_LENGTH") @NullableInDatabase - val sessionCt = new DoubleDatabaseField(self, "SESSION_CT") - val ratingOverkill = new NullableDoubleDatabaseField(self, "RATING_OVERKILL") - val minAge = new NullableDoubleDatabaseField(self, "MIN_AGE") - val maxAge = new NullableDoubleDatabaseField(self, "MAX_AGE") + val sessionCt = new IntDatabaseField(self, "SESSION_CT") + val ratingOverkill = new NullableIntDatabaseField(self, "RATING_OVERKILL") + val minAge = new NullableIntDatabaseField(self, "MIN_AGE") + val maxAge = new NullableIntDatabaseField(self, "MAX_AGE") @NullableInDatabase - val minSessionsForAttended = new DoubleDatabaseField(self, "MIN_SESSIONS_FOR_ATTENDED") + val minSessionsForAttended = new IntDatabaseField(self, "MIN_SESSIONS_FOR_ATTENDED") val active = new NullableBooleanDatabaseField(self, "ACTIVE") val displayOrder = new NullableDoubleDatabaseField(self, "DISPLAY_ORDER") val noLimit = new NullableBooleanDatabaseField(self, "NO_LIMIT") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassTypeOverride.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassTypeOverride.scala index a04c7a0e..31292ce8 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassTypeOverride.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassTypeOverride.scala @@ -13,7 +13,7 @@ class JpClassTypeOverride extends StorableClass(JpClassTypeOverride) { val rowId = new IntFieldValue(self, JpClassTypeOverride.fields.rowId) val personId = new IntFieldValue(self, JpClassTypeOverride.fields.personId) val typeId = new IntFieldValue(self, JpClassTypeOverride.fields.typeId) - val season = new NullableDoubleFieldValue(self, JpClassTypeOverride.fields.season) + val season = new NullableIntFieldValue(self, JpClassTypeOverride.fields.season) val isForOverkill = new BooleanFieldValue(self, JpClassTypeOverride.fields.isForOverkill) val createdOn = new DateTimeFieldValue(self, JpClassTypeOverride.fields.createdOn) val createdBy = new StringFieldValue(self, JpClassTypeOverride.fields.createdBy) @@ -31,7 +31,7 @@ object JpClassTypeOverride extends StorableObject[JpClassTypeOverride] { val rowId = new IntDatabaseField(self, "ROW_ID") val personId = new IntDatabaseField(self, "PERSON_ID") val typeId = new IntDatabaseField(self, "TYPE_ID") - val season = new NullableDoubleDatabaseField(self, "SEASON") + val season = new NullableIntDatabaseField(self, "SEASON") val isForOverkill = new BooleanDatabaseField(self, "IS_FOR_OVERKILL", false) @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpRatingsGranted.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpRatingsGranted.scala deleted file mode 100644 index e5ccb8cd..00000000 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpRatingsGranted.scala +++ /dev/null @@ -1,43 +0,0 @@ -package org.sailcbi.APIServer.Entities.EntityDefinitions - -import com.coleji.neptune.Storable.FieldValues._ -import com.coleji.neptune.Storable.Fields._ -import com.coleji.neptune.Storable._ -import com.coleji.neptune.Util._ -import org.sailcbi.APIServer.Entities.NullableInDatabase -import org.sailcbi.APIServer.Entities.entitycalculations._ -import play.api.libs.json._ - -class JpRatingsGranted extends StorableClass(JpRatingsGranted) { - override object values extends ValuesObject { - val grantId = new IntFieldValue(self, JpRatingsGranted.fields.grantId) - val ratingId = new NullableIntFieldValue(self, JpRatingsGranted.fields.ratingId) - val quantity = new NullableDoubleFieldValue(self, JpRatingsGranted.fields.quantity) - val drDate = new NullableDateTimeFieldValue(self, JpRatingsGranted.fields.drDate) - val createdOn = new DateTimeFieldValue(self, JpRatingsGranted.fields.createdOn) - val createdBy = new NullableStringFieldValue(self, JpRatingsGranted.fields.createdBy) - val updatedOn = new DateTimeFieldValue(self, JpRatingsGranted.fields.updatedOn) - val updatedBy = new NullableStringFieldValue(self, JpRatingsGranted.fields.updatedBy) - } -} - -object JpRatingsGranted extends StorableObject[JpRatingsGranted] { - override val useRuntimeFieldnamesForJson: Boolean = true - - override val entityName: String = "JP_RATINGS_GRANTED" - - object fields extends FieldsObject { - val grantId = new IntDatabaseField(self, "GRANT_ID") - val ratingId = new NullableIntDatabaseField(self, "RATING_ID") - val quantity = new NullableDoubleDatabaseField(self, "QUANTITY") - val drDate = new NullableDateTimeDatabaseField(self, "DR_DATE") - @NullableInDatabase - val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") - val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500) - @NullableInDatabase - val updatedOn = new DateTimeDatabaseField(self, "UPDATED_ON") - val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500) - } - - def primaryKey: IntDatabaseField = fields.grantId -} \ No newline at end of file diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipType.scala index 1f0e3183..ecd7e784 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MembershipType.scala @@ -23,7 +23,7 @@ class MembershipType extends StorableClass(MembershipType) { val createdBy = new StringFieldValue(self, MembershipType.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, MembershipType.fields.updatedOn) val updatedBy = new StringFieldValue(self, MembershipType.fields.updatedBy) - val duration = new NullableDoubleFieldValue(self, MembershipType.fields.duration) + val duration = new NullableIntFieldValue(self, MembershipType.fields.duration) val expirationType = new StringFieldValue(self, MembershipType.fields.expirationType) val price = new NullableDoubleFieldValue(self, MembershipType.fields.price) val oldDiscountType = new NullableDoubleFieldValue(self, MembershipType.fields.oldDiscountType) @@ -62,7 +62,7 @@ object MembershipType extends StorableObject[MembershipType] { val updatedOn = new DateTimeDatabaseField(self, "UPDATED_ON") @NullableInDatabase val updatedBy = new StringDatabaseField(self, "UPDATED_BY", 500) - val duration = new NullableDoubleDatabaseField(self, "DURATION") + val duration = new NullableIntDatabaseField(self, "DURATION") @NullableInDatabase val expirationType = new StringDatabaseField(self, "EXPIRATION_TYPE", 50) val price = new NullableDoubleDatabaseField(self, "PRICE") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala index b4ec6226..06d5ee17 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala @@ -19,7 +19,7 @@ class MergeHistory extends StorableClass(MergeHistory) { val createdBy = new NullableStringFieldValue(self, MergeHistory.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, MergeHistory.fields.updatedOn) val updatedBy = new NullableStringFieldValue(self, MergeHistory.fields.updatedBy) - val tablePk = new NullableDoubleFieldValue(self, MergeHistory.fields.tablePk) + val tablePk = new NullableIntFieldValue(self, MergeHistory.fields.tablePk) } } @@ -44,7 +44,7 @@ object MergeHistory extends StorableObject[MergeHistory] { @NullableInDatabase val updatedOn = new DateTimeDatabaseField(self, "UPDATED_ON") val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500) - val tablePk = new NullableDoubleDatabaseField(self, "TABLE_PK") + val tablePk = new NullableIntDatabaseField(self, "TABLE_PK") } def primaryKey: IntDatabaseField = fields.actionId diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala index 79ae11f5..0555932c 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala @@ -19,8 +19,8 @@ class OrderNumber extends StorableClass(OrderNumber) { val updatedOn = new DateTimeFieldValue(self, OrderNumber.fields.updatedOn) val updatedBy = new NullableStringFieldValue(self, OrderNumber.fields.updatedBy) val processedDate = new NullableDateTimeFieldValue(self, OrderNumber.fields.processedDate) - val approvedStripeChargeAtt = new NullableDoubleFieldValue(self, OrderNumber.fields.approvedStripeChargeAtt) - val addlStaggeredPayments = new NullableDoubleFieldValue(self, OrderNumber.fields.addlStaggeredPayments) + val approvedStripeChargeAtt = new NullableIntFieldValue(self, OrderNumber.fields.approvedStripeChargeAtt) + val addlStaggeredPayments = new NullableIntFieldValue(self, OrderNumber.fields.addlStaggeredPayments) val appAlias = new StringFieldValue(self, OrderNumber.fields.appAlias) val usePaymentIntent = new NullableBooleanFieldValue(self, OrderNumber.fields.usePaymentIntent) } @@ -43,8 +43,8 @@ object OrderNumber extends StorableObject[OrderNumber] { val updatedOn = new DateTimeDatabaseField(self, "UPDATED_ON") val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500) val processedDate = new NullableDateTimeDatabaseField(self, "PROCESSED_DATE") - val approvedStripeChargeAtt = new NullableDoubleDatabaseField(self, "APPROVED_STRIPE_CHARGE_ATT") - val addlStaggeredPayments = new NullableDoubleDatabaseField(self, "ADDL_STAGGERED_PAYMENTS") + val approvedStripeChargeAtt = new NullableIntDatabaseField(self, "APPROVED_STRIPE_CHARGE_ATT") + val addlStaggeredPayments = new NullableIntDatabaseField(self, "ADDL_STAGGERED_PAYMENTS") @NullableInDatabase val appAlias = new StringDatabaseField(self, "APP_ALIAS", 20) val usePaymentIntent = new NullableBooleanDatabaseField(self, "USE_PAYMENT_INTENT") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderStaggeredPayment.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderStaggeredPayment.scala index d08472e4..de5c0548 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderStaggeredPayment.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderStaggeredPayment.scala @@ -12,14 +12,14 @@ class OrderStaggeredPayment extends StorableClass(OrderStaggeredPayment) { override object values extends ValuesObject { val staggerId = new IntFieldValue(self, OrderStaggeredPayment.fields.staggerId) val orderId = new IntFieldValue(self, OrderStaggeredPayment.fields.orderId) - val seq = new DoubleFieldValue(self, OrderStaggeredPayment.fields.seq) + val seq = new IntFieldValue(self, OrderStaggeredPayment.fields.seq) val expectedPaymentDate = new DateTimeFieldValue(self, OrderStaggeredPayment.fields.expectedPaymentDate) val paid = new BooleanFieldValue(self, OrderStaggeredPayment.fields.paid) - val approvedStripeChargeAtt = new NullableDoubleFieldValue(self, OrderStaggeredPayment.fields.approvedStripeChargeAtt) + val approvedStripeChargeAtt = new NullableIntFieldValue(self, OrderStaggeredPayment.fields.approvedStripeChargeAtt) val paidCloseId = new NullableIntFieldValue(self, OrderStaggeredPayment.fields.paidCloseId) val redeemedCloseId = new NullableIntFieldValue(self, OrderStaggeredPayment.fields.redeemedCloseId) - val rawAmountInCents = new DoubleFieldValue(self, OrderStaggeredPayment.fields.rawAmountInCents) - val addlAmountInCents = new DoubleFieldValue(self, OrderStaggeredPayment.fields.addlAmountInCents) + val rawAmountInCents = new IntFieldValue(self, OrderStaggeredPayment.fields.rawAmountInCents) + val addlAmountInCents = new IntFieldValue(self, OrderStaggeredPayment.fields.addlAmountInCents) val paymentIntentRowId = new NullableIntFieldValue(self, OrderStaggeredPayment.fields.paymentIntentRowId) val failedCron = new NullableBooleanFieldValue(self, OrderStaggeredPayment.fields.failedCron) } @@ -33,16 +33,16 @@ object OrderStaggeredPayment extends StorableObject[OrderStaggeredPayment] { object fields extends FieldsObject { val staggerId = new IntDatabaseField(self, "STAGGER_ID") val orderId = new IntDatabaseField(self, "ORDER_ID") - val seq = new DoubleDatabaseField(self, "SEQ") + val seq = new IntDatabaseField(self, "SEQ") val expectedPaymentDate = new DateTimeDatabaseField(self, "EXPECTED_PAYMENT_DATE") val paid = new BooleanDatabaseField(self, "PAID", false) - val approvedStripeChargeAtt = new NullableDoubleDatabaseField(self, "APPROVED_STRIPE_CHARGE_ATT") + val approvedStripeChargeAtt = new NullableIntDatabaseField(self, "APPROVED_STRIPE_CHARGE_ATT") val paidCloseId = new NullableIntDatabaseField(self, "PAID_CLOSE_ID") val redeemedCloseId = new NullableIntDatabaseField(self, "REDEEMED_CLOSE_ID") @NullableInDatabase - val rawAmountInCents = new DoubleDatabaseField(self, "RAW_AMOUNT_IN_CENTS") + val rawAmountInCents = new IntDatabaseField(self, "RAW_AMOUNT_IN_CENTS") @NullableInDatabase - val addlAmountInCents = new DoubleDatabaseField(self, "ADDL_AMOUNT_IN_CENTS") + val addlAmountInCents = new IntDatabaseField(self, "ADDL_AMOUNT_IN_CENTS") val paymentIntentRowId = new NullableIntDatabaseField(self, "PAYMENT_INTENT_ROW_ID") val failedCron = new NullableBooleanDatabaseField(self, "FAILED_CRON") } diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersStripePaymentIntent.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersStripePaymentIntent.scala index 292973d8..bfe8d926 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersStripePaymentIntent.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersStripePaymentIntent.scala @@ -13,7 +13,7 @@ class OrdersStripePaymentIntent extends StorableClass(OrdersStripePaymentIntent) val rowId = new IntFieldValue(self, OrdersStripePaymentIntent.fields.rowId) val orderId = new IntFieldValue(self, OrdersStripePaymentIntent.fields.orderId) val paymentIntentId = new StringFieldValue(self, OrdersStripePaymentIntent.fields.paymentIntentId) - val amountInCents = new DoubleFieldValue(self, OrdersStripePaymentIntent.fields.amountInCents) + val amountInCents = new IntFieldValue(self, OrdersStripePaymentIntent.fields.amountInCents) val paid = new BooleanFieldValue(self, OrdersStripePaymentIntent.fields.paid) val paidCloseId = new IntFieldValue(self, OrdersStripePaymentIntent.fields.paidCloseId) } @@ -28,7 +28,7 @@ object OrdersStripePaymentIntent extends StorableObject[OrdersStripePaymentInten val rowId = new IntDatabaseField(self, "ROW_ID") val orderId = new IntDatabaseField(self, "ORDER_ID") val paymentIntentId = new StringDatabaseField(self, "PAYMENT_INTENT_ID", 50) - val amountInCents = new DoubleDatabaseField(self, "AMOUNT_IN_CENTS") + val amountInCents = new IntDatabaseField(self, "AMOUNT_IN_CENTS") val paid = new BooleanDatabaseField(self, "PAID", false) val paidCloseId = new IntDatabaseField(self, "PAID_CLOSE_ID") } diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Person.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Person.scala index c08ce06a..290d0e81 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Person.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Person.scala @@ -77,7 +77,7 @@ class Person extends StorableClass(Person) { val allowSignouts = new NullableBooleanFieldValue(self, Person.fields.allowSignouts) val sendAlert = new NullableBooleanFieldValue(self, Person.fields.sendAlert) val temp = new StringFieldValue(self, Person.fields.temp) - val personType = new NullableDoubleFieldValue(self, Person.fields.personType) + val personType = new NullableIntFieldValue(self, Person.fields.personType) val emerg1PhonePrimaryType = new NullableStringFieldValue(self, Person.fields.emerg1PhonePrimaryType) val emerg1PhoneAlternateType = new NullableStringFieldValue(self, Person.fields.emerg1PhoneAlternateType) val emerg2PhonePrimaryType = new NullableStringFieldValue(self, Person.fields.emerg2PhonePrimaryType) @@ -88,7 +88,7 @@ class Person extends StorableClass(Person) { val reducedLunch = new NullableBooleanFieldValue(self, Person.fields.reducedLunch) val pwHash = new NullableStringFieldValue(self, Person.fields.pwHash) val incomeLevel = new NullableDoubleFieldValue(self, Person.fields.incomeLevel) - val swimProof = new NullableDoubleFieldValue(self, Person.fields.swimProof) + val swimProof = new NullableIntFieldValue(self, Person.fields.swimProof) val oldFundraisingGreeting = new NullableStringFieldValue(self, Person.fields.oldFundraisingGreeting) val oldPhoneWork = new NullableStringFieldValue(self, Person.fields.oldPhoneWork) val languageOther = new NullableStringFieldValue(self, Person.fields.languageOther) @@ -102,7 +102,7 @@ class Person extends StorableClass(Person) { val specNeedsVerified = new NullableBooleanFieldValue(self, Person.fields.specNeedsVerified) val memberComment = new NullableStringFieldValue(self, Person.fields.memberComment) val verifiedEmail = new NullableStringFieldValue(self, Person.fields.verifiedEmail) - val uapBoat = new NullableDoubleFieldValue(self, Person.fields.uapBoat) + val uapBoat = new NullableIntFieldValue(self, Person.fields.uapBoat) val ignoreJpMinAge = new NullableBooleanFieldValue(self, Person.fields.ignoreJpMinAge) val uapInterestedLessons = new NullableBooleanFieldValue(self, Person.fields.uapInterestedLessons) val uapInterestedRides = new NullableBooleanFieldValue(self, Person.fields.uapInterestedRides) @@ -117,7 +117,7 @@ class Person extends StorableClass(Person) { val protoState = new NullableStringFieldValue(self, Person.fields.protoState) val veteranEligible = new NullableBooleanFieldValue(self, Person.fields.veteranEligible) val stripeCustomerId = new NullableStringFieldValue(self, Person.fields.stripeCustomerId) - val hasAuthedAs = new NullableDoubleFieldValue(self, Person.fields.hasAuthedAs) + val hasAuthedAs = new NullableIntFieldValue(self, Person.fields.hasAuthedAs) val pwHashScheme = new NullableStringFieldValue(self, Person.fields.pwHashScheme) val nextRecurringDonation = new NullableDateTimeFieldValue(self, Person.fields.nextRecurringDonation) val slackUserId = new NullableStringFieldValue(self, Person.fields.slackUserId) @@ -189,7 +189,7 @@ object Person extends StorableObject[Person] { val allowSignouts = new NullableBooleanDatabaseField(self, "ALLOW_SIGNOUTS") val sendAlert = new NullableBooleanDatabaseField(self, "SEND_ALERT") val temp = new StringDatabaseField(self, "TEMP", 1) - val personType = new NullableDoubleDatabaseField(self, "PERSON_TYPE") + val personType = new NullableIntDatabaseField(self, "PERSON_TYPE") val emerg1PhonePrimaryType = new NullableStringDatabaseField(self, "EMERG1_PHONE_PRIMARY_TYPE", 50) val emerg1PhoneAlternateType = new NullableStringDatabaseField(self, "EMERG1_PHONE_ALTERNATE_TYPE", 50) val emerg2PhonePrimaryType = new NullableStringDatabaseField(self, "EMERG2_PHONE_PRIMARY_TYPE", 50) @@ -200,7 +200,7 @@ object Person extends StorableObject[Person] { val reducedLunch = new NullableBooleanDatabaseField(self, "REDUCED_LUNCH") val pwHash = new NullableStringDatabaseField(self, "PW_HASH", 100) val incomeLevel = new NullableDoubleDatabaseField(self, "INCOME_LEVEL") - val swimProof = new NullableDoubleDatabaseField(self, "SWIM_PROOF") + val swimProof = new NullableIntDatabaseField(self, "SWIM_PROOF") val oldFundraisingGreeting = new NullableStringDatabaseField(self, "OLD_FUNDRAISING_GREETING", 300) val oldPhoneWork = new NullableStringDatabaseField(self, "OLD_PHONE_WORK", 50) val languageOther = new NullableStringDatabaseField(self, "LANGUAGE_OTHER", 200) @@ -214,7 +214,7 @@ object Person extends StorableObject[Person] { val specNeedsVerified = new NullableBooleanDatabaseField(self, "SPEC_NEEDS_VERIFIED") val memberComment = new NullableStringDatabaseField(self, "MEMBER_COMMENT", -1) val verifiedEmail = new NullableStringDatabaseField(self, "VERIFIED_EMAIL", 1000) - val uapBoat = new NullableDoubleDatabaseField(self, "UAP_BOAT") + val uapBoat = new NullableIntDatabaseField(self, "UAP_BOAT") val ignoreJpMinAge = new NullableBooleanDatabaseField(self, "IGNORE_JP_MIN_AGE") val uapInterestedLessons = new NullableBooleanDatabaseField(self, "UAP_INTERESTED_LESSONS") val uapInterestedRides = new NullableBooleanDatabaseField(self, "UAP_INTERESTED_RIDES") @@ -229,7 +229,7 @@ object Person extends StorableObject[Person] { val protoState = new NullableStringDatabaseField(self, "PROTO_STATE", 1) val veteranEligible = new NullableBooleanDatabaseField(self, "VETERAN_ELIGIBLE") val stripeCustomerId = new NullableStringDatabaseField(self, "STRIPE_CUSTOMER_ID", 30) - val hasAuthedAs = new NullableDoubleDatabaseField(self, "HAS_AUTHED_AS") + val hasAuthedAs = new NullableIntDatabaseField(self, "HAS_AUTHED_AS") val pwHashScheme = new NullableStringDatabaseField(self, "PW_HASH_SCHEME", 20) val nextRecurringDonation = new NullableDateTimeDatabaseField(self, "NEXT_RECURRING_DONATION") val slackUserId = new NullableStringDatabaseField(self, "SLACK_USER_ID", 20) diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsDiscountsEligible.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsDiscountsEligible.scala index 0510e6d5..bd17055f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsDiscountsEligible.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsDiscountsEligible.scala @@ -13,7 +13,7 @@ class PersonsDiscountsEligible extends StorableClass(PersonsDiscountsEligible) { val rowId = new IntFieldValue(self, PersonsDiscountsEligible.fields.rowId) val personId = new IntFieldValue(self, PersonsDiscountsEligible.fields.personId) val discountId = new IntFieldValue(self, PersonsDiscountsEligible.fields.discountId) - val season = new DoubleFieldValue(self, PersonsDiscountsEligible.fields.season) + val season = new IntFieldValue(self, PersonsDiscountsEligible.fields.season) val createdOn = new DateTimeFieldValue(self, PersonsDiscountsEligible.fields.createdOn) val createdBy = new StringFieldValue(self, PersonsDiscountsEligible.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, PersonsDiscountsEligible.fields.updatedOn) @@ -33,7 +33,7 @@ object PersonsDiscountsEligible extends StorableObject[PersonsDiscountsEligible] @NullableInDatabase val discountId = new IntDatabaseField(self, "DISCOUNT_ID") @NullableInDatabase - val season = new DoubleDatabaseField(self, "SEASON") + val season = new IntDatabaseField(self, "SEASON") @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") @NullableInDatabase diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsRecurringDonation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsRecurringDonation.scala index 69bab1e8..9ee5e94e 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsRecurringDonation.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsRecurringDonation.scala @@ -13,7 +13,7 @@ class PersonsRecurringDonation extends StorableClass(PersonsRecurringDonation) { val rowId = new IntFieldValue(self, PersonsRecurringDonation.fields.rowId) val personId = new IntFieldValue(self, PersonsRecurringDonation.fields.personId) val fundId = new IntFieldValue(self, PersonsRecurringDonation.fields.fundId) - val amountInCents = new DoubleFieldValue(self, PersonsRecurringDonation.fields.amountInCents) + val amountInCents = new IntFieldValue(self, PersonsRecurringDonation.fields.amountInCents) val createdOn = new NullableDateTimeFieldValue(self, PersonsRecurringDonation.fields.createdOn) val embryonic = new NullableBooleanFieldValue(self, PersonsRecurringDonation.fields.embryonic) } @@ -28,7 +28,7 @@ object PersonsRecurringDonation extends StorableObject[PersonsRecurringDonation] val rowId = new IntDatabaseField(self, "ROW_ID") val personId = new IntDatabaseField(self, "PERSON_ID") val fundId = new IntDatabaseField(self, "FUND_ID") - val amountInCents = new DoubleDatabaseField(self, "AMOUNT_IN_CENTS") + val amountInCents = new IntDatabaseField(self, "AMOUNT_IN_CENTS") val createdOn = new NullableDateTimeDatabaseField(self, "CREATED_ON") val embryonic = new NullableBooleanDatabaseField(self, "EMBRYONIC") } diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsToDelete.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsToDelete.scala index 86fe1b0b..1f7589bd 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsToDelete.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsToDelete.scala @@ -12,7 +12,7 @@ class PersonsToDelete extends StorableClass(PersonsToDelete) { override object values extends ValuesObject { val rowId = new IntFieldValue(self, PersonsToDelete.fields.rowId) val personId = new IntFieldValue(self, PersonsToDelete.fields.personId) - val mergedInto = new DoubleFieldValue(self, PersonsToDelete.fields.mergedInto) + val mergedInto = new IntFieldValue(self, PersonsToDelete.fields.mergedInto) } } @@ -26,7 +26,7 @@ object PersonsToDelete extends StorableObject[PersonsToDelete] { @NullableInDatabase val personId = new IntDatabaseField(self, "PERSON_ID") @NullableInDatabase - val mergedInto = new DoubleDatabaseField(self, "MERGED_INTO") + val mergedInto = new IntDatabaseField(self, "MERGED_INTO") } def primaryKey: IntDatabaseField = fields.rowId diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala index a45b2284..3c28ad6f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala @@ -11,7 +11,7 @@ import play.api.libs.json._ class Preference extends StorableClass(Preference) { override object values extends ValuesObject { val prefId = new IntFieldValue(self, Preference.fields.prefId) - val dataType = new DoubleFieldValue(self, Preference.fields.dataType) + val dataType = new IntFieldValue(self, Preference.fields.dataType) val createdOn = new DateTimeFieldValue(self, Preference.fields.createdOn) val createdBy = new StringFieldValue(self, Preference.fields.createdBy) val updatedOn = new DateTimeFieldValue(self, Preference.fields.updatedOn) @@ -29,7 +29,7 @@ object Preference extends StorableObject[Preference] { object fields extends FieldsObject { val prefId = new IntDatabaseField(self, "PREF_ID") @NullableInDatabase - val dataType = new DoubleDatabaseField(self, "DATA_TYPE") + val dataType = new IntDatabaseField(self, "DATA_TYPE") @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") @NullableInDatabase diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala index 99215ebc..20e4a08f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala @@ -24,8 +24,8 @@ class Rating extends StorableClass(Rating) { val displayOrder = new DoubleFieldValue(self, Rating.fields.displayOrder) val active = new NullableBooleanFieldValue(self, Rating.fields.active) val overriddenBy = new NullableIntFieldValue(self, Rating.fields.overriddenBy) - val testMinCrew = new NullableDoubleFieldValue(self, Rating.fields.testMinCrew) - val testMaxCrew = new NullableDoubleFieldValue(self, Rating.fields.testMaxCrew) + val testMinCrew = new NullableIntFieldValue(self, Rating.fields.testMinCrew) + val testMaxCrew = new NullableIntFieldValue(self, Rating.fields.testMaxCrew) val testable = new NullableBooleanFieldValue(self, Rating.fields.testable) val ratingCategory = new StringFieldValue(self, Rating.fields.ratingCategory) } @@ -52,8 +52,8 @@ object Rating extends StorableObject[Rating] { val displayOrder = new DoubleDatabaseField(self, "DISPLAY_ORDER") val active = new NullableBooleanDatabaseField(self, "ACTIVE") val overriddenBy = new NullableIntDatabaseField(self, "OVERRIDDEN_BY") - val testMinCrew = new NullableDoubleDatabaseField(self, "TEST_MIN_CREW") - val testMaxCrew = new NullableDoubleDatabaseField(self, "TEST_MAX_CREW") + val testMinCrew = new NullableIntDatabaseField(self, "TEST_MIN_CREW") + val testMaxCrew = new NullableIntDatabaseField(self, "TEST_MAX_CREW") val testable = new NullableBooleanDatabaseField(self, "TESTABLE") @NullableInDatabase val ratingCategory = new StringDatabaseField(self, "RATING_CATEGORY", 1) diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala index b6b8d2da..fb0dd5cf 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala @@ -32,7 +32,7 @@ class Signout extends StorableClass(Signout) { val updatedBy = new NullableStringFieldValue(self, Signout.fields.updatedBy) val didCapsize = new NullableBooleanFieldValue(self, Signout.fields.didCapsize) val isQueued = new BooleanFieldValue(self, Signout.fields.isQueued) - val queueOrder = new NullableDoubleFieldValue(self, Signout.fields.queueOrder) + val queueOrder = new NullableIntFieldValue(self, Signout.fields.queueOrder) val personId = new NullableIntFieldValue(self, Signout.fields.personId) val comments = new NullableStringFieldValue(self, Signout.fields.comments) val oldCrewCount = new NullableDoubleFieldValue(self, Signout.fields.oldCrewCount) @@ -71,7 +71,7 @@ object Signout extends StorableObject[Signout] { val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500) val didCapsize = new NullableBooleanDatabaseField(self, "DID_CAPSIZE") val isQueued = new BooleanDatabaseField(self, "IS_QUEUED", false) - val queueOrder = new NullableDoubleDatabaseField(self, "QUEUE_ORDER") + val queueOrder = new NullableIntDatabaseField(self, "QUEUE_ORDER") val personId = new NullableIntDatabaseField(self, "PERSON_ID") val comments = new NullableStringDatabaseField(self, "COMMENTS", 4000) val oldCrewCount = new NullableDoubleDatabaseField(self, "OLD_CREW_COUNT") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala index 911173cc..55d4bae9 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala @@ -15,8 +15,8 @@ class StripeToken extends StorableClass(StripeToken) { val orderId = new NullableIntFieldValue(self, StripeToken.fields.orderId) val createdDatetime = new DateTimeFieldValue(self, StripeToken.fields.createdDatetime) val cardLastDigits = new NullableStringFieldValue(self, StripeToken.fields.cardLastDigits) - val cardExpMonth = new NullableDoubleFieldValue(self, StripeToken.fields.cardExpMonth) - val cardExpYear = new NullableDoubleFieldValue(self, StripeToken.fields.cardExpYear) + val cardExpMonth = new NullableIntFieldValue(self, StripeToken.fields.cardExpMonth) + val cardExpYear = new NullableIntFieldValue(self, StripeToken.fields.cardExpYear) val cardZip = new NullableStringFieldValue(self, StripeToken.fields.cardZip) val active = new BooleanFieldValue(self, StripeToken.fields.active) } @@ -35,8 +35,8 @@ object StripeToken extends StorableObject[StripeToken] { @NullableInDatabase val createdDatetime = new DateTimeDatabaseField(self, "CREATED_DATETIME") val cardLastDigits = new NullableStringDatabaseField(self, "CARD_LAST_DIGITS", 10) - val cardExpMonth = new NullableDoubleDatabaseField(self, "CARD_EXP_MONTH") - val cardExpYear = new NullableDoubleDatabaseField(self, "CARD_EXP_YEAR") + val cardExpMonth = new NullableIntDatabaseField(self, "CARD_EXP_MONTH") + val cardExpYear = new NullableIntDatabaseField(self, "CARD_EXP_YEAR") val cardZip = new NullableStringDatabaseField(self, "CARD_ZIP", 20) val active = new BooleanDatabaseField(self, "ACTIVE", false) } diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SunsetTime.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SunsetTime.scala index 69212345..89be71c9 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SunsetTime.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SunsetTime.scala @@ -16,7 +16,7 @@ class SunsetTime extends StorableClass(SunsetTime) { val sunrise = new DateTimeFieldValue(self, SunsetTime.fields.sunrise) val sunset = new DateTimeFieldValue(self, SunsetTime.fields.sunset) val twilightEnd = new DateTimeFieldValue(self, SunsetTime.fields.twilightEnd) - val dayLengthSeconds = new DoubleFieldValue(self, SunsetTime.fields.dayLengthSeconds) + val dayLengthSeconds = new IntFieldValue(self, SunsetTime.fields.dayLengthSeconds) val sonarNoon = new DateTimeFieldValue(self, SunsetTime.fields.sonarNoon) val nauticalTwilightStart = new DateTimeFieldValue(self, SunsetTime.fields.nauticalTwilightStart) val nauticalTwilightEnd = new DateTimeFieldValue(self, SunsetTime.fields.nauticalTwilightEnd) @@ -37,7 +37,7 @@ object SunsetTime extends StorableObject[SunsetTime] { val sunrise = new DateTimeDatabaseField(self, "SUNRISE") val sunset = new DateTimeDatabaseField(self, "SUNSET") val twilightEnd = new DateTimeDatabaseField(self, "TWILIGHT_END") - val dayLengthSeconds = new DoubleDatabaseField(self, "DAY_LENGTH_SECONDS") + val dayLengthSeconds = new IntDatabaseField(self, "DAY_LENGTH_SECONDS") val sonarNoon = new DateTimeDatabaseField(self, "SONAR_NOON") val nauticalTwilightStart = new DateTimeDatabaseField(self, "NAUTICAL_TWILIGHT_START") val nauticalTwilightEnd = new DateTimeDatabaseField(self, "NAUTICAL_TWILIGHT_END") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SymonSchedule.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SymonSchedule.scala index 6c8621cf..879d0cce 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SymonSchedule.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SymonSchedule.scala @@ -14,7 +14,7 @@ class SymonSchedule extends StorableClass(SymonSchedule) { val hostName = new StringFieldValue(self, SymonSchedule.fields.hostName) val programName = new StringFieldValue(self, SymonSchedule.fields.programName) val argString = new NullableStringFieldValue(self, SymonSchedule.fields.argString) - val freqDays = new DoubleFieldValue(self, SymonSchedule.fields.freqDays) + val freqDays = new IntFieldValue(self, SymonSchedule.fields.freqDays) val createdOn = new NullableDateTimeFieldValue(self, SymonSchedule.fields.createdOn) val createdBy = new NullableStringFieldValue(self, SymonSchedule.fields.createdBy) val updatedOn = new NullableDateTimeFieldValue(self, SymonSchedule.fields.updatedOn) @@ -37,7 +37,7 @@ object SymonSchedule extends StorableObject[SymonSchedule] { val programName = new StringDatabaseField(self, "PROGRAM_NAME", 50) val argString = new NullableStringDatabaseField(self, "ARG_STRING", 250) @NullableInDatabase - val freqDays = new DoubleDatabaseField(self, "FREQ_DAYS") + val freqDays = new IntDatabaseField(self, "FREQ_DAYS") val createdOn = new NullableDateTimeDatabaseField(self, "CREATED_ON") val createdBy = new NullableStringDatabaseField(self, "CREATED_BY", 500) val updatedOn = new NullableDateTimeDatabaseField(self, "UPDATED_ON") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala index 908fe3d8..098b8a00 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala @@ -24,7 +24,7 @@ class User extends StorableClass(User) { val updatedBy = new NullableStringFieldValue(self, User.fields.updatedBy) val locked = new NullableBooleanFieldValue(self, User.fields.locked) val pwChangeReqd = new NullableBooleanFieldValue(self, User.fields.pwChangeReqd) - val badAttempts = new NullableDoubleFieldValue(self, User.fields.badAttempts) + val badAttempts = new NullableIntFieldValue(self, User.fields.badAttempts) val nameFirst = new StringFieldValue(self, User.fields.nameFirst) val nameLast = new StringFieldValue(self, User.fields.nameLast) val sagePwCipher = new NullableStringFieldValue(self, User.fields.sagePwCipher) @@ -58,7 +58,7 @@ object User extends StorableObject[User] { val updatedBy = new NullableStringDatabaseField(self, "UPDATED_BY", 500) val locked = new NullableBooleanDatabaseField(self, "LOCKED") val pwChangeReqd = new NullableBooleanDatabaseField(self, "PW_CHANGE_REQD") - val badAttempts = new NullableDoubleDatabaseField(self, "BAD_ATTEMPTS") + val badAttempts = new NullableIntDatabaseField(self, "BAD_ATTEMPTS") @NullableInDatabase val nameFirst = new StringDatabaseField(self, "NAME_FIRST", 100) @NullableInDatabase diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala index b33197b5..4d35fa22 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala @@ -14,7 +14,7 @@ class UsersIp extends StorableClass(UsersIp) { val ipAddress = new StringFieldValue(self, UsersIp.fields.ipAddress) val firstDatetime = new NullableDateTimeFieldValue(self, UsersIp.fields.firstDatetime) val lastDatetime = new NullableDateTimeFieldValue(self, UsersIp.fields.lastDatetime) - val useCount = new NullableDoubleFieldValue(self, UsersIp.fields.useCount) + val useCount = new NullableIntFieldValue(self, UsersIp.fields.useCount) } } @@ -28,7 +28,7 @@ object UsersIp extends StorableObject[UsersIp] { val ipAddress = new StringDatabaseField(self, "IP_ADDRESS", 50) val firstDatetime = new NullableDateTimeDatabaseField(self, "FIRST_DATETIME") val lastDatetime = new NullableDateTimeDatabaseField(self, "LAST_DATETIME") - val useCount = new NullableDoubleDatabaseField(self, "USE_COUNT") + val useCount = new NullableIntDatabaseField(self, "USE_COUNT") } def primaryKey: IntDatabaseField = fields.userId diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala index 18e5b251..fdefeae9 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala @@ -11,8 +11,8 @@ import play.api.libs.json._ class WikiEntrie extends StorableClass(WikiEntrie) { override object values extends ValuesObject { val entryId = new IntFieldValue(self, WikiEntrie.fields.entryId) - val app = new DoubleFieldValue(self, WikiEntrie.fields.app) - val page = new DoubleFieldValue(self, WikiEntrie.fields.page) + val app = new IntFieldValue(self, WikiEntrie.fields.app) + val page = new IntFieldValue(self, WikiEntrie.fields.page) val content = new NullableStringFieldValue(self, WikiEntrie.fields.content) val createdOn = new DateTimeFieldValue(self, WikiEntrie.fields.createdOn) val createdBy = new StringFieldValue(self, WikiEntrie.fields.createdBy) @@ -29,9 +29,9 @@ object WikiEntrie extends StorableObject[WikiEntrie] { object fields extends FieldsObject { val entryId = new IntDatabaseField(self, "ENTRY_ID") @NullableInDatabase - val app = new DoubleDatabaseField(self, "APP") + val app = new IntDatabaseField(self, "APP") @NullableInDatabase - val page = new DoubleDatabaseField(self, "PAGE") + val page = new IntDatabaseField(self, "PAGE") val content = new NullableStringDatabaseField(self, "CONTENT", -1) @NullableInDatabase val createdOn = new DateTimeDatabaseField(self, "CREATED_ON") diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala index 0b20fbb3..352a48d7 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala @@ -11,7 +11,7 @@ import play.api.libs.json._ class YearlyDate extends StorableClass(YearlyDate) { override object values extends ValuesObject { val dateId = new IntFieldValue(self, YearlyDate.fields.dateId) - val year = new DoubleFieldValue(self, YearlyDate.fields.year) + val year = new IntFieldValue(self, YearlyDate.fields.year) val itemId = new IntFieldValue(self, YearlyDate.fields.itemId) val startDate = new DateTimeFieldValue(self, YearlyDate.fields.startDate) val createdOn = new NullableDateTimeFieldValue(self, YearlyDate.fields.createdOn) @@ -30,7 +30,7 @@ object YearlyDate extends StorableObject[YearlyDate] { object fields extends FieldsObject { val dateId = new IntDatabaseField(self, "DATE_ID") @NullableInDatabase - val year = new DoubleDatabaseField(self, "YEAR") + val year = new IntDatabaseField(self, "YEAR") @NullableInDatabase val itemId = new IntDatabaseField(self, "ITEM_ID") @NullableInDatabase