diff --git a/app/com/coleji/neptune/API/RestControllerWithDTO2.scala b/app/com/coleji/neptune/API/RestControllerWithDTO2.scala index 389a8465..77330d7c 100644 --- a/app/com/coleji/neptune/API/RestControllerWithDTO2.scala +++ b/app/com/coleji/neptune/API/RestControllerWithDTO2.scala @@ -1,7 +1,7 @@ package com.coleji.neptune.API import com.coleji.neptune.Core.{PermissionsAuthority, UnlockedRequestCache} -import com.coleji.neptune.Storable.{DTOClass, StorableClass, StorableObject} +import com.coleji.neptune.Storable.{StorableClass, StorableObject} import scala.reflect.runtime.universe diff --git a/app/com/coleji/neptune/Core/RelationalBroker.scala b/app/com/coleji/neptune/Core/RelationalBroker.scala index 99d1be15..3444c4ce 100644 --- a/app/com/coleji/neptune/Core/RelationalBroker.scala +++ b/app/com/coleji/neptune/Core/RelationalBroker.scala @@ -563,6 +563,7 @@ abstract class RelationalBroker private[Core](dbGateway: DatabaseGateway, prepar withConnection(pool)(conn => { println("STARTING PROCEDURE CALL: " + pc.getQuery) val callable: CallableStatement = conn.prepareCall(s"{call ${pc.getQuery}}") + // register outs and inouts pc.registerOutParameters.foreach(Function.tupled((paramName: String, dataType: Int) => { callable.registerOutParameter(paramName, dataType) @@ -582,7 +583,6 @@ abstract class RelationalBroker private[Core](dbGateway: DatabaseGateway, prepar println(s"$paramName = $value") callable.setDouble(paramName, value) })) - println("DONE WITH PARAM SETTING") // Date params DO NOT WORK // Everything will appear to work and then it will act as though the transaction was not committed @@ -605,7 +605,7 @@ abstract class RelationalBroker private[Core](dbGateway: DatabaseGateway, prepar val hadResults: Boolean = callable.execute() // conn.commit() - println("DONE EXECUTING") + pc.getOutResults(callable) }) } diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Public/Sunset.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Public/Sunset.scala index 2548d4a9..24af6a01 100644 --- a/app/org/sailcbi/APIServer/Api/Endpoints/Public/Sunset.scala +++ b/app/org/sailcbi/APIServer/Api/Endpoints/Public/Sunset.scala @@ -1,10 +1,9 @@ package org.sailcbi.APIServer.Api.Endpoints.Public import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority} -import org.sailcbi.APIServer.Entities.EntityDefinitions.SunsetTime import org.sailcbi.APIServer.Entities.cacheable.sunset.{SunsetCache, SunsetCacheKey} import org.sailcbi.APIServer.UserTypes.PublicRequestCache -import play.api.libs.json.{Json, Writes} +import play.api.libs.json.Json import play.api.mvc.{Action, AnyContent, InjectedController} import javax.inject.Inject diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ClassInstructor/PutClassInstructor.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ClassInstructor/PutClassInstructor.scala index 10ad2e1c..acd454d5 100644 --- a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ClassInstructor/PutClassInstructor.scala +++ b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ClassInstructor/PutClassInstructor.scala @@ -1,6 +1,6 @@ package org.sailcbi.APIServer.Api.Endpoints.Staff.Rest.ClassInstructor -import com.coleji.neptune.API.{RestControllerWithDTO, RestControllerWithDTO2, ValidationError, ValidationOk, ValidationResult} +import com.coleji.neptune.API.{RestControllerWithDTO2, ValidationError, ValidationOk, ValidationResult} import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority, UnlockedRequestCache} import org.sailcbi.APIServer.Entities.EntityDefinitions.ClassInstructor import org.sailcbi.APIServer.Entities.access.CbiPermissions diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/PersonMembership/GetPersonMembership.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/PersonMembership/GetPersonMembership.scala index c79d06f2..ddef1463 100644 --- a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/PersonMembership/GetPersonMembership.scala +++ b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/PersonMembership/GetPersonMembership.scala @@ -1,7 +1,7 @@ package org.sailcbi.APIServer.Api.Endpoints.Staff.Rest.PersonMembership import com.coleji.neptune.API.RestController -import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority, RequestCache, UnlockedRequestCache} +import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority, RequestCache} import com.coleji.neptune.Storable.StorableQuery.QueryBuilder import org.sailcbi.APIServer.Entities.EntityDefinitions._ import org.sailcbi.APIServer.UserTypes.StaffRequestCache diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfile.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfile.scala index de1cb06f..8a7e6a92 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfile.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfile.scala @@ -3,10 +3,6 @@ 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 AccessProfile extends StorableClass(AccessProfile) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassFormat.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassFormat.scala index aa6bb5e0..d61461cf 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassFormat.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassFormat.scala @@ -5,8 +5,6 @@ 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 ApClassFormat extends StorableClass(ApClassFormat) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSignup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSignup.scala index c3ec9813..e5b190a9 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSignup.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSignup.scala @@ -5,8 +5,6 @@ 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 ApClassSignup extends StorableClass(ApClassSignup) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala index 6307e273..29da0cf5 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala @@ -5,8 +5,6 @@ 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 ApClassType extends StorableClass(ApClassType) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppIdIndex.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppIdIndex.scala index 743e3c75..d78b6bbd 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppIdIndex.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppIdIndex.scala @@ -3,10 +3,6 @@ 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 AppIdIndex extends StorableClass(AppIdIndex) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilege.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilege.scala index 5c9291e8..de825b88 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilege.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilege.scala @@ -3,10 +3,6 @@ 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 AppPrivilege extends StorableClass(AppPrivilege) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatRating.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatRating.scala index 474098a1..2d24be1f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatRating.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatRating.scala @@ -3,10 +3,7 @@ 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 BoatRating extends StorableClass(BoatRating) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala index fa223e42..ac5b12d2 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala @@ -3,10 +3,7 @@ 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 BoatType extends StorableClass(BoatType) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BudgetItem.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BudgetItem.scala index 70ccfb7b..bd7cd1f5 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BudgetItem.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BudgetItem.scala @@ -3,10 +3,7 @@ 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 BudgetItem extends StorableClass(BudgetItem) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala index 67711c5a..8e235a25 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala @@ -3,10 +3,7 @@ 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 CardDismissal extends StorableClass(CardDismissal) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcErrorCode.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcErrorCode.scala index fa2eef87..332b5f0f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcErrorCode.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcErrorCode.scala @@ -3,10 +3,6 @@ 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 CcErrorCode extends StorableClass(CcErrorCode) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcLog.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcLog.scala index 5bbe4b3d..b9317a70 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcLog.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcLog.scala @@ -3,10 +3,7 @@ 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 CcLog extends StorableClass(CcLog) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassLocation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassLocation.scala index 2185c5a2..6ba004e3 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassLocation.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassLocation.scala @@ -3,10 +3,7 @@ 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 ClassLocation extends StorableClass(ClassLocation) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsTable.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsTable.scala index 02c0fc48..c864d7f2 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsTable.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsTable.scala @@ -3,10 +3,7 @@ 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 CommentsTable extends StorableClass(CommentsTable) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Countrie.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Countrie.scala index d3dcfe17..5b63923d 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Countrie.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Countrie.scala @@ -3,10 +3,7 @@ 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 Countrie extends StorableClass(Countrie) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DamageWaiver.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DamageWaiver.scala index 0211e7f4..ec9f4984 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DamageWaiver.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DamageWaiver.scala @@ -3,10 +3,7 @@ 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 DamageWaiver extends StorableClass(DamageWaiver) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DhGlobal.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DhGlobal.scala index 73484cf8..44c24292 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DhGlobal.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DhGlobal.scala @@ -3,10 +3,7 @@ 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 DhGlobal extends StorableClass(DhGlobal) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Discount.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Discount.scala index 171d3edd..1a4ed49f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Discount.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Discount.scala @@ -3,10 +3,6 @@ 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 Discount extends StorableClass(Discount) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCode.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCode.scala index 463d8b2c..7c126992 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCode.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCode.scala @@ -3,10 +3,7 @@ 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 DiscountCode extends StorableClass(DiscountCode) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReport.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReport.scala index 4f18fdf3..a258d624 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReport.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReport.scala @@ -3,10 +3,7 @@ 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 DockReport extends StorableClass(DockReport) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Donation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Donation.scala index e5344bf2..e988c1d9 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Donation.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Donation.scala @@ -5,8 +5,6 @@ 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 Donation extends StorableClass(Donation) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationFund.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationFund.scala index 1159551a..d834d142 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationFund.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationFund.scala @@ -3,10 +3,7 @@ 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 DonationFund extends StorableClass(DonationFund) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala index 3127afd2..2492586a 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala @@ -3,10 +3,7 @@ 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 EiiMit extends StorableClass(EiiMit) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala index 0a1b29e4..087a2bea 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala @@ -3,10 +3,7 @@ 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 EiiOverride extends StorableClass(EiiOverride) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala index 7f70904e..d5e0bf31 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala @@ -3,10 +3,7 @@ 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 EiiResponse extends StorableClass(EiiResponse) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContent.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContent.scala index 870f7ebf..40cc5906 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContent.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContent.scala @@ -3,10 +3,7 @@ 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 EmailContent extends StorableClass(EmailContent) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala index c4899a73..ec1661a8 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala @@ -3,10 +3,6 @@ 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 ErrorType extends StorableClass(ErrorType) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Event.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Event.scala index ac4aa58a..16724ace 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Event.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Event.scala @@ -3,10 +3,7 @@ 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 Event extends StorableClass(Event) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Feedback.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Feedback.scala index dc50b323..eea8cb43 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Feedback.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Feedback.scala @@ -3,10 +3,7 @@ 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 Feedback extends StorableClass(Feedback) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala index cb29d936..5b53c630 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala @@ -3,10 +3,6 @@ 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 FlagChange extends StorableClass(FlagChange) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagsGlobal.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagsGlobal.scala index aa5d282c..2863a5db 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagsGlobal.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagsGlobal.scala @@ -3,10 +3,7 @@ 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 FlagsGlobal extends StorableClass(FlagsGlobal) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAppliedGc.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAppliedGc.scala index 68e775cb..d2cd97c8 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAppliedGc.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAppliedGc.scala @@ -3,10 +3,7 @@ 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 FoAppliedGc extends StorableClass(FoAppliedGc) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAr.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAr.scala index afc95b76..a2c3615f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAr.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoAr.scala @@ -3,10 +3,7 @@ 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 FoAr extends StorableClass(FoAr) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoArSource.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoArSource.scala index 38677c92..2611f3f6 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoArSource.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoArSource.scala @@ -3,10 +3,7 @@ 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 FoArSource extends StorableClass(FoArSource) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala index 69e038bc..512f56e3 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCash.scala @@ -3,10 +3,7 @@ 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 FoCash extends StorableClass(FoCash) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCheck.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCheck.scala index 919ca74d..4d559c01 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCheck.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCheck.scala @@ -3,10 +3,7 @@ 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 FoCheck extends StorableClass(FoCheck) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala index 8422005e..ce181faf 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoClose.scala @@ -3,10 +3,7 @@ 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 FoClose extends StorableClass(FoClose) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCloseUser.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCloseUser.scala index dbd0606b..201306cd 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCloseUser.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoCloseUser.scala @@ -3,10 +3,6 @@ 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 FoCloseUser extends StorableClass(FoCloseUser) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala index 51f65946..a7b68fe1 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItem.scala @@ -3,10 +3,7 @@ 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 FoItem extends StorableClass(FoItem) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala index 26a06afd..e8632b2d 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoItemType.scala @@ -3,10 +3,7 @@ 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 FoItemType extends StorableClass(FoItemType) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala index a067e5ac..cd351162 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMisc.scala @@ -3,10 +3,7 @@ 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 FoMisc extends StorableClass(FoMisc) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMiscLookup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMiscLookup.scala index bae7f12f..a69da165 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMiscLookup.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoMiscLookup.scala @@ -3,10 +3,7 @@ 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 FoMiscLookup extends StorableClass(FoMiscLookup) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala index f1028fcb..7ca24adf 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FoParking.scala @@ -3,10 +3,7 @@ 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 FoParking extends StorableClass(FoParking) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GuestPriv.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GuestPriv.scala index 893aedf5..2a355a0b 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GuestPriv.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/GuestPriv.scala @@ -3,10 +3,7 @@ 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 GuestPriv extends StorableClass(GuestPriv) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchool.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchool.scala index 8295c989..3292a41d 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchool.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/HighSchool.scala @@ -3,10 +3,7 @@ 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 HighSchool extends StorableClass(HighSchool) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkill.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkill.scala index 34355b3c..12400ad0 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkill.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassSkill.scala @@ -3,10 +3,7 @@ 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 JpClassSkill extends StorableClass(JpClassSkill) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala index fae72a5b..6662024f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClassType.scala @@ -3,10 +3,7 @@ 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 JpClassType extends StorableClass(JpClassType) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClosure.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClosure.scala index a83e20b9..0cadf7cc 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClosure.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpClosure.scala @@ -3,10 +3,7 @@ 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 JpClosure extends StorableClass(JpClosure) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpGroup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpGroup.scala index 5b224066..264c4ec2 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpGroup.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpGroup.scala @@ -3,10 +3,7 @@ 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 JpGroup extends StorableClass(JpGroup) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpNoSwim.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpNoSwim.scala index d3963a39..930f32c5 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpNoSwim.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpNoSwim.scala @@ -3,10 +3,7 @@ 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 JpNoSwim extends StorableClass(JpNoSwim) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeam.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeam.scala index 2518ce5e..2f9b0bc2 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeam.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeam.scala @@ -3,10 +3,7 @@ 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 JpTeam extends StorableClass(JpTeam) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEvent.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEvent.scala index 9a70aae4..6e47ebfa 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEvent.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpTeamEvent.scala @@ -3,10 +3,7 @@ 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 JpTeamEvent extends StorableClass(JpTeamEvent) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpWeather.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpWeather.scala index 5fa4b0a8..dae2e792 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpWeather.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/JpWeather.scala @@ -3,10 +3,7 @@ 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 JpWeather extends StorableClass(JpWeather) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Language.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Language.scala index c2a02b46..16fb3670 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Language.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Language.scala @@ -3,10 +3,7 @@ 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 Language extends StorableClass(Language) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala index 06d5ee17..47ae306f 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/MergeHistory.scala @@ -3,10 +3,7 @@ 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 MergeHistory extends StorableClass(MergeHistory) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutGroup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutGroup.scala index 9e9efd0d..bd91d87d 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutGroup.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OptOutGroup.scala @@ -3,10 +3,7 @@ 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 OptOutGroup extends StorableClass(OptOutGroup) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala index 0555932c..c80866f0 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrderNumber.scala @@ -3,10 +3,7 @@ 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 OrderNumber extends StorableClass(OrderNumber) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersPromo.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersPromo.scala index c688468f..844a3fc4 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersPromo.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/OrdersPromo.scala @@ -3,10 +3,7 @@ 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 OrdersPromo extends StorableClass(OrdersPromo) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Pa.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Pa.scala index 07602cc2..2dbf9b42 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Pa.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Pa.scala @@ -3,10 +3,6 @@ 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 Pa extends StorableClass(Pa) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonCard.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonCard.scala index cd68d67d..b27ca8bf 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonCard.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonCard.scala @@ -3,10 +3,7 @@ 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 PersonCard extends StorableClass(PersonCard) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRating.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRating.scala index accd8430..3b7d2c3d 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRating.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonRating.scala @@ -4,9 +4,6 @@ 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 PersonRating extends StorableClass(PersonRating) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTag.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTag.scala index 3495d5d0..eacdf139 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTag.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonTag.scala @@ -5,8 +5,6 @@ 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 PersonTag extends StorableClass(PersonTag) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonType.scala index cf70865f..2192f81a 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonType.scala @@ -3,10 +3,7 @@ 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 PersonType extends StorableClass(PersonType) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsEvent.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsEvent.scala index defb4235..cda30543 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsEvent.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsEvent.scala @@ -3,10 +3,7 @@ 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 PersonsEvent extends StorableClass(PersonsEvent) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsTemp.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsTemp.scala index 79a08cdb..e0230e22 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsTemp.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/PersonsTemp.scala @@ -3,10 +3,6 @@ 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 PersonsTemp extends StorableClass(PersonsTemp) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala index 3c28ad6f..3eab8e99 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Preference.scala @@ -3,10 +3,7 @@ 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 Preference extends StorableClass(Preference) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ProgramType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ProgramType.scala index c0dda0a0..38ca2688 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ProgramType.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ProgramType.scala @@ -3,10 +3,7 @@ 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 ProgramType extends StorableClass(ProgramType) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Promotion.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Promotion.scala index d96e029d..6dc3ba65 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Promotion.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Promotion.scala @@ -3,10 +3,7 @@ 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 Promotion extends StorableClass(Promotion) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RaCz.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RaCz.scala index 8b88d9d3..a4883d0e 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RaCz.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RaCz.scala @@ -3,10 +3,7 @@ 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 RaCz extends StorableClass(RaCz) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala index 20e4a08f..59947fbf 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Rating.scala @@ -5,8 +5,6 @@ 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 Rating extends StorableClass(Rating) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingChange.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingChange.scala index a857a045..b400ac16 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingChange.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/RatingChange.scala @@ -3,10 +3,7 @@ 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 RatingChange extends StorableClass(RatingChange) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ResetPwReq.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ResetPwReq.scala index 98803de2..2b84aa03 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ResetPwReq.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ResetPwReq.scala @@ -3,10 +3,7 @@ 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 ResetPwReq extends StorableClass(ResetPwReq) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Restriction.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Restriction.scala index dfe61e8b..9c9b5feb 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Restriction.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Restriction.scala @@ -3,10 +3,7 @@ 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 Restriction extends StorableClass(Restriction) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionKey.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionKey.scala index 4d166a4d..1e3110aa 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionKey.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SessionKey.scala @@ -3,10 +3,7 @@ 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 SessionKey extends StorableClass(SessionKey) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala index fb0dd5cf..417937f9 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Signout.scala @@ -5,8 +5,6 @@ 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 Signout extends StorableClass(Signout) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutCrew.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutCrew.scala index 934ee7a6..94770eac 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutCrew.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutCrew.scala @@ -5,8 +5,6 @@ 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 SignoutCrew extends StorableClass(SignoutCrew) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutTest.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutTest.scala index 8bfff84c..3aef20d4 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutTest.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SignoutTest.scala @@ -5,8 +5,6 @@ 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 SignoutTest extends StorableClass(SignoutTest) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SpecialNeed.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SpecialNeed.scala index 2d401499..a4a561f8 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SpecialNeed.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/SpecialNeed.scala @@ -3,10 +3,7 @@ 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 SpecialNeed extends StorableClass(SpecialNeed) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/State.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/State.scala index be5f19d1..c36f14ba 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/State.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/State.scala @@ -3,10 +3,7 @@ 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 State extends StorableClass(State) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala index 55d4bae9..36f1deba 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/StripeToken.scala @@ -3,10 +3,7 @@ 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 StripeToken extends StorableClass(StripeToken) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Sunset.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Sunset.scala index 37ab5bbe..1e65e5bd 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Sunset.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Sunset.scala @@ -3,10 +3,7 @@ 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 Sunset extends StorableClass(Sunset) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TableInfo.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TableInfo.scala index abc7de55..3c8c3b64 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TableInfo.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TableInfo.scala @@ -3,10 +3,7 @@ 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 TableInfo extends StorableClass(TableInfo) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Tag.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Tag.scala index 8598e610..39c6be14 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Tag.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Tag.scala @@ -3,10 +3,7 @@ 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 Tag extends StorableClass(Tag) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TextFile.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TextFile.scala index 313b6934..0dee0126 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TextFile.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/TextFile.scala @@ -3,10 +3,7 @@ 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 TextFile extends StorableClass(TextFile) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapComment.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapComment.scala index fcefcdab..f929919c 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapComment.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapComment.scala @@ -3,10 +3,7 @@ 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 UapComment extends StorableClass(UapComment) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroup.scala index f265b875..fcd1d562 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroup.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UapGroup.scala @@ -3,10 +3,7 @@ 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 UapGroup extends StorableClass(UapGroup) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala index c39aea8a..d04e3618 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/User.scala @@ -5,8 +5,6 @@ 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 User extends StorableClass(User) { override object references extends ReferencesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UserRole.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UserRole.scala index a1be1f1e..b8f5575a 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UserRole.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UserRole.scala @@ -3,10 +3,7 @@ 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 UserRole extends StorableClass(UserRole) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala index 4d35fa22..09d9d5f4 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/UsersIp.scala @@ -3,10 +3,6 @@ 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 UsersIp extends StorableClass(UsersIp) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala index fdefeae9..15e6438a 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/WikiEntrie.scala @@ -3,10 +3,7 @@ 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 WikiEntrie extends StorableClass(WikiEntrie) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala index 352a48d7..2323122d 100644 --- a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala +++ b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/YearlyDate.scala @@ -3,10 +3,7 @@ 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 YearlyDate extends StorableClass(YearlyDate) { override object values extends ValuesObject { diff --git a/app/org/sailcbi/APIServer/Entities/cacheable/CacheKeys.scala b/app/org/sailcbi/APIServer/Entities/cacheable/CacheKeys.scala index d1a5f115..f5a693e0 100644 --- a/app/org/sailcbi/APIServer/Entities/cacheable/CacheKeys.scala +++ b/app/org/sailcbi/APIServer/Entities/cacheable/CacheKeys.scala @@ -1,9 +1,9 @@ package org.sailcbi.APIServer.Entities.cacheable import org.sailcbi.APIServer.Entities.cacheable.ApClassInstances.ApClassInstancesCacheKey +import org.sailcbi.APIServer.Entities.cacheable.DatetimeRange.DatetimeRangeCacheKey import org.sailcbi.APIServer.Entities.cacheable.MembershipSales.MembershipSalesCacheKey import org.sailcbi.APIServer.Entities.cacheable.sunset.SunsetCacheKey -import org.sailcbi.APIServer.Entities.cacheable.DatetimeRange.DatetimeRangeCacheKey import org.sailcbi.APIServer.Entities.cacheable.yearlydate.YearlyDateAndItemCacheKey import java.time.format.DateTimeFormatter diff --git a/app/org/sailcbi/APIServer/Entities/cacheable/DatetimeRange/DatetimeRangeCache.scala b/app/org/sailcbi/APIServer/Entities/cacheable/DatetimeRange/DatetimeRangeCache.scala index 31d2e392..ae687a24 100644 --- a/app/org/sailcbi/APIServer/Entities/cacheable/DatetimeRange/DatetimeRangeCache.scala +++ b/app/org/sailcbi/APIServer/Entities/cacheable/DatetimeRange/DatetimeRangeCache.scala @@ -6,6 +6,7 @@ import com.coleji.neptune.Storable.StorableQuery.QueryBuilder import com.coleji.neptune.Util.Serde import org.sailcbi.APIServer.Entities.EntityDefinitions.DatetimeRange import org.sailcbi.APIServer.Entities.cacheable.CacheKeys + import java.time.Duration object DatetimeRangeCache extends CacheableFactory[DatetimeRangeCacheKey, List[DatetimeRange]] { diff --git a/app/org/sailcbi/APIServer/Entities/dto/PutClassInstructorDTO.scala b/app/org/sailcbi/APIServer/Entities/dto/PutClassInstructorDTO.scala index 8c96acbe..99f87f8f 100644 --- a/app/org/sailcbi/APIServer/Entities/dto/PutClassInstructorDTO.scala +++ b/app/org/sailcbi/APIServer/Entities/dto/PutClassInstructorDTO.scala @@ -1,7 +1,5 @@ package org.sailcbi.APIServer.Entities.dto -import com.coleji.neptune.Storable.DTOClass -import org.sailcbi.APIServer.Entities.EntityDefinitions.ClassInstructor import play.api.libs.json.{JsValue, Json} case class PutClassInstructorDTO( diff --git a/app/org/sailcbi/APIServer/Logic/ApClassLogic.scala b/app/org/sailcbi/APIServer/Logic/ApClassLogic.scala index 6e8793ad..0a0975c7 100644 --- a/app/org/sailcbi/APIServer/Logic/ApClassLogic.scala +++ b/app/org/sailcbi/APIServer/Logic/ApClassLogic.scala @@ -14,7 +14,7 @@ import org.sailcbi.APIServer.Entities.dto.{GuidedSailCurrentSessionDTO, GuidedSa import org.sailcbi.APIServer.UserTypes.MemberRequestCache import java.sql.CallableStatement -import java.time.{DayOfWeek, Duration, LocalDate, LocalDateTime, LocalTime} +import java.time._ object ApClassLogic { private val AP_GUIDED_SAIL_DURATION = Duration.ofMinutes(90) diff --git a/app/org/sailcbi/APIServer/Logic/DockhouseLogic/CreateSignoutLogic/CreateSignoutLogic.scala b/app/org/sailcbi/APIServer/Logic/DockhouseLogic/CreateSignoutLogic/CreateSignoutLogic.scala index d3472263..6d29f5ff 100644 --- a/app/org/sailcbi/APIServer/Logic/DockhouseLogic/CreateSignoutLogic/CreateSignoutLogic.scala +++ b/app/org/sailcbi/APIServer/Logic/DockhouseLogic/CreateSignoutLogic/CreateSignoutLogic.scala @@ -2,7 +2,7 @@ package org.sailcbi.APIServer.Logic.DockhouseLogic.CreateSignoutLogic import com.coleji.neptune.Core.UnlockedRequestCache import com.coleji.neptune.Util.BitVector -import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Dockhouse.CreateSignout.{DtoStaffDockhouseCreateSignoutPostRequest} +import org.sailcbi.APIServer.Api.Endpoints.Dto.Staff.Dockhouse.CreateSignout.DtoStaffDockhouseCreateSignoutPostRequest import org.sailcbi.APIServer.Entities.EntityDefinitions.{Signout, SignoutTest} import org.sailcbi.APIServer.Entities.MagicIds import org.sailcbi.APIServer.Logic.IO.DockhouseIo diff --git a/app/org/sailcbi/APIServer/Logic/RatingLogic.scala b/app/org/sailcbi/APIServer/Logic/RatingLogic.scala index acdb2525..96e9e428 100644 --- a/app/org/sailcbi/APIServer/Logic/RatingLogic.scala +++ b/app/org/sailcbi/APIServer/Logic/RatingLogic.scala @@ -1,6 +1,5 @@ package org.sailcbi.APIServer.Logic -import com.coleji.neptune.Core.RequestCache import com.coleji.neptune.Storable.StorableQuery.QueryBuilder import com.coleji.neptune.Util.ListUtil import org.sailcbi.APIServer.Entities.EntityDefinitions.{BoatType, PersonRating, ProgramType, Rating} diff --git a/schema-changes b/schema-changes deleted file mode 100644 index 7380757b..00000000 --- a/schema-changes +++ /dev/null @@ -1,17 +0,0 @@ -ap_class_pkg -/******************************************************************/ -procedure create_class_instance_vc( - p_format_id in number, - p_session_datetime in varchar, - p_instance_id out number -) -as -begin - ap_class_pkg.create_class_instance(p_format_id, to_date(p_session_datetime, 'MM/DD/YYYY HH24:MI:SS')); - p_instance_id := ap_class_instances_seq.currval; -end create_class_instance_vc; - - - - -