From c96c24c21ef688ce18b7547a8fe7e8dea93807b6 Mon Sep 17 00:00:00 2001 From: axunonb Date: Wed, 18 Sep 2024 23:45:33 +0200 Subject: [PATCH] Refactor data table InfoService to reflect previously retired fields * Create new DAL targeting NET8.0 * Remove retired fields from data table InfoService * Remove deleted entity properties from controllers and views --- Src/DAL/DatabaseGeneric/ConstantsEnums.cs | 2 +- .../EntityClasses/CalendarEntity.cs | 79 ++++++++--------- .../EntityClasses/CommonEntityBase.cs | 2 +- .../EntityClasses/CountryEntity.cs | 14 +-- .../EntityClasses/InfoServiceEntity.cs | 85 +++++-------------- .../EntityClasses/PlayingAbilityEntity.cs | 11 +-- .../EntityClasses/SentNewsletterEntity.cs | 13 +-- .../EntityClasses/SurfaceEntity.cs | 11 +-- .../FactoryClasses/EntityFactories.cs | 2 +- .../FactoryClasses/QueryFactory.cs | 2 +- .../HelperClasses/DynamicRelation.cs | 2 +- .../HelperClasses/EntityCollection.cs | 2 +- .../HelperClasses/FieldCreationClasses.cs | 10 +-- .../HelperClasses/LinqMetaData.cs | 2 +- .../HelperClasses/ModelInfoProvider.cs | 8 +- .../HelperClasses/ResultsetFields.cs | 2 +- .../HelperClasses/TypeDefaultValue.cs | 2 +- Src/DAL/DatabaseSpecific/ActionProcedures.cs | 2 +- Src/DAL/DatabaseSpecific/DataAccessAdapter.cs | 2 +- .../PersistenceInfoProvider.cs | 46 +++++----- .../DatabaseSpecific/RetrievalProcedures.cs | 2 +- Src/DAL/TournamentCalendar-DAL.llblgenproj | 62 ++++++-------- .../Controllers/Calendar.cs | 2 +- .../Controllers/InfoService.cs | 17 ++-- .../Calendar/CalendarEntityDisplayModel.cs | 4 +- .../Models/InfoService/EditModel.cs | 7 +- .../Models/InfoService/UnsubscribeModel.cs | 17 ++-- .../Shared/ApproveModelTournamentCalendar.cs | 9 +- .../Services/UserLocationService.cs | 3 +- .../Views/InfoService/Edit.cshtml | 6 +- .../Views/InfoService/Unsubscribe.cshtml | 2 +- .../GenericRepository.cs | 11 ++- .../InfoServiceRepository.cs | 2 +- 33 files changed, 179 insertions(+), 264 deletions(-) diff --git a/Src/DAL/DatabaseGeneric/ConstantsEnums.cs b/Src/DAL/DatabaseGeneric/ConstantsEnums.cs index b5f80dc..f86308c 100644 --- a/Src/DAL/DatabaseGeneric/ConstantsEnums.cs +++ b/Src/DAL/DatabaseGeneric/ConstantsEnums.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseGeneric/EntityClasses/CalendarEntity.cs b/Src/DAL/DatabaseGeneric/EntityClasses/CalendarEntity.cs index 74d50e3..56d2607 100644 --- a/Src/DAL/DatabaseGeneric/EntityClasses/CalendarEntity.cs +++ b/Src/DAL/DatabaseGeneric/EntityClasses/CalendarEntity.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates @@ -178,7 +178,7 @@ private void InitClassEmpty(IValidator validator, IEntityFields2 fields) public virtual Nullable ApprovedOn { get { return (Nullable)GetValue((int)CalendarFieldIndex.ApprovedOn, false); } - set { SetValue((int)CalendarFieldIndex.ApprovedOn, value); } + set { SetValue((int)CalendarFieldIndex.ApprovedOn, value); } } /// The AttachmentFile property of the Entity Calendar

 @@ -186,7 +186,7 @@ public virtual Nullable ApprovedOn public virtual System.String AttachmentFile { get { return (System.String)GetValue((int)CalendarFieldIndex.AttachmentFile, true); } - set { SetValue((int)CalendarFieldIndex.AttachmentFile, value); } + set { SetValue((int)CalendarFieldIndex.AttachmentFile, value); } } /// The Bond property of the Entity Calendar

 @@ -194,7 +194,7 @@ public virtual System.String AttachmentFile public virtual System.Decimal Bond { get { return (System.Decimal)GetValue((int)CalendarFieldIndex.Bond, true); } - set { SetValue((int)CalendarFieldIndex.Bond, value); } + set { SetValue((int)CalendarFieldIndex.Bond, value); } } /// The City property of the Entity Calendar

 @@ -202,7 +202,7 @@ public virtual System.Decimal Bond public virtual System.String City { get { return (System.String)GetValue((int)CalendarFieldIndex.City, true); } - set { SetValue((int)CalendarFieldIndex.City, value); } + set { SetValue((int)CalendarFieldIndex.City, value); } } /// The ClosingDate property of the Entity Calendar

 @@ -210,7 +210,7 @@ public virtual System.String City public virtual System.DateTime ClosingDate { get { return (System.DateTime)GetValue((int)CalendarFieldIndex.ClosingDate, true); } - set { SetValue((int)CalendarFieldIndex.ClosingDate, value); } + set { SetValue((int)CalendarFieldIndex.ClosingDate, value); } } /// The ContactAddress property of the Entity Calendar

 @@ -218,7 +218,7 @@ public virtual System.DateTime ClosingDate public virtual System.String ContactAddress { get { return (System.String)GetValue((int)CalendarFieldIndex.ContactAddress, true); } - set { SetValue((int)CalendarFieldIndex.ContactAddress, value); } + set { SetValue((int)CalendarFieldIndex.ContactAddress, value); } } /// The CountryId property of the Entity Calendar

 @@ -226,7 +226,7 @@ public virtual System.String ContactAddress public virtual System.String CountryId { get { return (System.String)GetValue((int)CalendarFieldIndex.CountryId, true); } - set { SetValue((int)CalendarFieldIndex.CountryId, value); } + set { SetValue((int)CalendarFieldIndex.CountryId, value); } } /// The CreatedByUser property of the Entity Calendar

 @@ -234,7 +234,7 @@ public virtual System.String CountryId public virtual System.String CreatedByUser { get { return (System.String)GetValue((int)CalendarFieldIndex.CreatedByUser, true); } - set { SetValue((int)CalendarFieldIndex.CreatedByUser, value); } + set { SetValue((int)CalendarFieldIndex.CreatedByUser, value); } } /// The CreatedOn property of the Entity Calendar

 @@ -242,7 +242,7 @@ public virtual System.String CreatedByUser public virtual System.DateTime CreatedOn { get { return (System.DateTime)GetValue((int)CalendarFieldIndex.CreatedOn, true); } - set { SetValue((int)CalendarFieldIndex.CreatedOn, value); } + set { SetValue((int)CalendarFieldIndex.CreatedOn, value); } } /// The DateFrom property of the Entity Calendar

 @@ -250,7 +250,7 @@ public virtual System.DateTime CreatedOn public virtual System.DateTime DateFrom { get { return (System.DateTime)GetValue((int)CalendarFieldIndex.DateFrom, true); } - set { SetValue((int)CalendarFieldIndex.DateFrom, value); } + set { SetValue((int)CalendarFieldIndex.DateFrom, value); } } /// The DateTo property of the Entity Calendar

 @@ -258,7 +258,7 @@ public virtual System.DateTime DateFrom public virtual System.DateTime DateTo { get { return (System.DateTime)GetValue((int)CalendarFieldIndex.DateTo, true); } - set { SetValue((int)CalendarFieldIndex.DateTo, value); } + set { SetValue((int)CalendarFieldIndex.DateTo, value); } } /// The DeletedOn property of the Entity Calendar

 @@ -266,7 +266,7 @@ public virtual System.DateTime DateTo public virtual Nullable DeletedOn { get { return (Nullable)GetValue((int)CalendarFieldIndex.DeletedOn, false); } - set { SetValue((int)CalendarFieldIndex.DeletedOn, value); } + set { SetValue((int)CalendarFieldIndex.DeletedOn, value); } } /// The Email property of the Entity Calendar

 @@ -274,7 +274,7 @@ public virtual Nullable DeletedOn public virtual System.String Email { get { return (System.String)GetValue((int)CalendarFieldIndex.Email, true); } - set { SetValue((int)CalendarFieldIndex.Email, value); } + set { SetValue((int)CalendarFieldIndex.Email, value); } } /// The EntryFee property of the Entity Calendar

 @@ -282,7 +282,7 @@ public virtual System.String Email public virtual System.Decimal EntryFee { get { return (System.Decimal)GetValue((int)CalendarFieldIndex.EntryFee, true); } - set { SetValue((int)CalendarFieldIndex.EntryFee, value); } + set { SetValue((int)CalendarFieldIndex.EntryFee, value); } } /// The Guid property of the Entity Calendar

 @@ -290,7 +290,7 @@ public virtual System.Decimal EntryFee public virtual System.String Guid { get { return (System.String)GetValue((int)CalendarFieldIndex.Guid, true); } - set { SetValue((int)CalendarFieldIndex.Guid, value); } + set { SetValue((int)CalendarFieldIndex.Guid, value); } } /// The Id property of the Entity Calendar

 @@ -298,14 +298,15 @@ public virtual System.String Guid public virtual System.Int64 Id { get { return (System.Int64)GetValue((int)CalendarFieldIndex.Id, true); } - set { SetValue((int)CalendarFieldIndex.Id, value); } } + set { SetValue((int)CalendarFieldIndex.Id, value); } + } /// The Info property of the Entity Calendar

 /// Mapped on table field: "Calendar"."Info".
Table field type characteristics (type, precision, scale, length): NVarChar, 0, 0, 1024.
Table field behavior characteristics (is nullable, is PK, is identity): true, false, false public virtual System.String Info { get { return (System.String)GetValue((int)CalendarFieldIndex.Info, true); } - set { SetValue((int)CalendarFieldIndex.Info, value); } + set { SetValue((int)CalendarFieldIndex.Info, value); } } /// The IsMinPlayersFemale property of the Entity Calendar

 @@ -313,7 +314,7 @@ public virtual System.String Info public virtual System.Boolean IsMinPlayersFemale { get { return (System.Boolean)GetValue((int)CalendarFieldIndex.IsMinPlayersFemale, true); } - set { SetValue((int)CalendarFieldIndex.IsMinPlayersFemale, value); } + set { SetValue((int)CalendarFieldIndex.IsMinPlayersFemale, value); } } /// The IsMinPlayersMale property of the Entity Calendar

 @@ -321,7 +322,7 @@ public virtual System.Boolean IsMinPlayersFemale public virtual System.Boolean IsMinPlayersMale { get { return (System.Boolean)GetValue((int)CalendarFieldIndex.IsMinPlayersMale, true); } - set { SetValue((int)CalendarFieldIndex.IsMinPlayersMale, value); } + set { SetValue((int)CalendarFieldIndex.IsMinPlayersMale, value); } } /// The Latitude property of the Entity Calendar

 @@ -329,7 +330,7 @@ public virtual System.Boolean IsMinPlayersMale public virtual Nullable Latitude { get { return (Nullable)GetValue((int)CalendarFieldIndex.Latitude, false); } - set { SetValue((int)CalendarFieldIndex.Latitude, value); } + set { SetValue((int)CalendarFieldIndex.Latitude, value); } } /// The Longitude property of the Entity Calendar

 @@ -337,7 +338,7 @@ public virtual Nullable Latitude public virtual Nullable Longitude { get { return (Nullable)GetValue((int)CalendarFieldIndex.Longitude, false); } - set { SetValue((int)CalendarFieldIndex.Longitude, value); } + set { SetValue((int)CalendarFieldIndex.Longitude, value); } } /// The ModifiedOn property of the Entity Calendar

 @@ -345,7 +346,7 @@ public virtual Nullable Longitude public virtual System.DateTime ModifiedOn { get { return (System.DateTime)GetValue((int)CalendarFieldIndex.ModifiedOn, true); } - set { SetValue((int)CalendarFieldIndex.ModifiedOn, value); } + set { SetValue((int)CalendarFieldIndex.ModifiedOn, value); } } /// The NumOfTeams property of the Entity Calendar

 @@ -353,7 +354,7 @@ public virtual System.DateTime ModifiedOn public virtual System.Int32 NumOfTeams { get { return (System.Int32)GetValue((int)CalendarFieldIndex.NumOfTeams, true); } - set { SetValue((int)CalendarFieldIndex.NumOfTeams, value); } + set { SetValue((int)CalendarFieldIndex.NumOfTeams, value); } } /// The NumPlayersFemale property of the Entity Calendar

 @@ -361,7 +362,7 @@ public virtual System.Int32 NumOfTeams public virtual System.Int32 NumPlayersFemale { get { return (System.Int32)GetValue((int)CalendarFieldIndex.NumPlayersFemale, true); } - set { SetValue((int)CalendarFieldIndex.NumPlayersFemale, value); } + set { SetValue((int)CalendarFieldIndex.NumPlayersFemale, value); } } /// The NumPlayersMale property of the Entity Calendar

 @@ -369,7 +370,7 @@ public virtual System.Int32 NumPlayersFemale public virtual System.Int32 NumPlayersMale { get { return (System.Int32)GetValue((int)CalendarFieldIndex.NumPlayersMale, true); } - set { SetValue((int)CalendarFieldIndex.NumPlayersMale, value); } + set { SetValue((int)CalendarFieldIndex.NumPlayersMale, value); } } /// The Organizer property of the Entity Calendar

 @@ -377,7 +378,7 @@ public virtual System.Int32 NumPlayersMale public virtual System.String Organizer { get { return (System.String)GetValue((int)CalendarFieldIndex.Organizer, true); } - set { SetValue((int)CalendarFieldIndex.Organizer, value); } + set { SetValue((int)CalendarFieldIndex.Organizer, value); } } /// The PlayingAbilityFrom property of the Entity Calendar

 @@ -385,7 +386,7 @@ public virtual System.String Organizer public virtual System.Int64 PlayingAbilityFrom { get { return (System.Int64)GetValue((int)CalendarFieldIndex.PlayingAbilityFrom, true); } - set { SetValue((int)CalendarFieldIndex.PlayingAbilityFrom, value); } + set { SetValue((int)CalendarFieldIndex.PlayingAbilityFrom, value); } } /// The PlayingAbilityTo property of the Entity Calendar

 @@ -393,7 +394,7 @@ public virtual System.Int64 PlayingAbilityFrom public virtual System.Int64 PlayingAbilityTo { get { return (System.Int64)GetValue((int)CalendarFieldIndex.PlayingAbilityTo, true); } - set { SetValue((int)CalendarFieldIndex.PlayingAbilityTo, value); } + set { SetValue((int)CalendarFieldIndex.PlayingAbilityTo, value); } } /// The PostalCode property of the Entity Calendar

 @@ -401,7 +402,7 @@ public virtual System.Int64 PlayingAbilityTo public virtual System.String PostalCode { get { return (System.String)GetValue((int)CalendarFieldIndex.PostalCode, true); } - set { SetValue((int)CalendarFieldIndex.PostalCode, value); } + set { SetValue((int)CalendarFieldIndex.PostalCode, value); } } /// The PostedByEmail property of the Entity Calendar

 @@ -409,7 +410,7 @@ public virtual System.String PostalCode public virtual System.String PostedByEmail { get { return (System.String)GetValue((int)CalendarFieldIndex.PostedByEmail, true); } - set { SetValue((int)CalendarFieldIndex.PostedByEmail, value); } + set { SetValue((int)CalendarFieldIndex.PostedByEmail, value); } } /// The PostedByName property of the Entity Calendar

 @@ -417,7 +418,7 @@ public virtual System.String PostedByEmail public virtual System.String PostedByName { get { return (System.String)GetValue((int)CalendarFieldIndex.PostedByName, true); } - set { SetValue((int)CalendarFieldIndex.PostedByName, value); } + set { SetValue((int)CalendarFieldIndex.PostedByName, value); } } /// The PostedByPassword property of the Entity Calendar

 @@ -425,7 +426,7 @@ public virtual System.String PostedByName public virtual System.String PostedByPassword { get { return (System.String)GetValue((int)CalendarFieldIndex.PostedByPassword, true); } - set { SetValue((int)CalendarFieldIndex.PostedByPassword, value); } + set { SetValue((int)CalendarFieldIndex.PostedByPassword, value); } } /// The Special property of the Entity Calendar

 @@ -433,7 +434,7 @@ public virtual System.String PostedByPassword public virtual System.String Special { get { return (System.String)GetValue((int)CalendarFieldIndex.Special, true); } - set { SetValue((int)CalendarFieldIndex.Special, value); } + set { SetValue((int)CalendarFieldIndex.Special, value); } } /// The Street property of the Entity Calendar

 @@ -441,7 +442,7 @@ public virtual System.String Special public virtual System.String Street { get { return (System.String)GetValue((int)CalendarFieldIndex.Street, true); } - set { SetValue((int)CalendarFieldIndex.Street, value); } + set { SetValue((int)CalendarFieldIndex.Street, value); } } /// The Surface property of the Entity Calendar

 @@ -449,7 +450,7 @@ public virtual System.String Street public virtual System.Int64 Surface { get { return (System.Int64)GetValue((int)CalendarFieldIndex.Surface, true); } - set { SetValue((int)CalendarFieldIndex.Surface, value); } + set { SetValue((int)CalendarFieldIndex.Surface, value); } } /// The TournamentName property of the Entity Calendar

 @@ -457,7 +458,7 @@ public virtual System.Int64 Surface public virtual System.String TournamentName { get { return (System.String)GetValue((int)CalendarFieldIndex.TournamentName, true); } - set { SetValue((int)CalendarFieldIndex.TournamentName, value); } + set { SetValue((int)CalendarFieldIndex.TournamentName, value); } } /// The Venue property of the Entity Calendar

 @@ -465,7 +466,7 @@ public virtual System.String TournamentName public virtual System.String Venue { get { return (System.String)GetValue((int)CalendarFieldIndex.Venue, true); } - set { SetValue((int)CalendarFieldIndex.Venue, value); } + set { SetValue((int)CalendarFieldIndex.Venue, value); } } /// The Website property of the Entity Calendar

 @@ -473,7 +474,7 @@ public virtual System.String Venue public virtual System.String Website { get { return (System.String)GetValue((int)CalendarFieldIndex.Website, true); } - set { SetValue((int)CalendarFieldIndex.Website, value); } + set { SetValue((int)CalendarFieldIndex.Website, value); } } /// Gets / sets related entity of type 'CountryEntity' which has to be set using a fetch action earlier. If no related entity is set for this property, null is returned..

 diff --git a/Src/DAL/DatabaseGeneric/EntityClasses/CommonEntityBase.cs b/Src/DAL/DatabaseGeneric/EntityClasses/CommonEntityBase.cs index 01a2985..f64b8af 100644 --- a/Src/DAL/DatabaseGeneric/EntityClasses/CommonEntityBase.cs +++ b/Src/DAL/DatabaseGeneric/EntityClasses/CommonEntityBase.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseGeneric/EntityClasses/CountryEntity.cs b/Src/DAL/DatabaseGeneric/EntityClasses/CountryEntity.cs index 09c0c17..845a8e6 100644 --- a/Src/DAL/DatabaseGeneric/EntityClasses/CountryEntity.cs +++ b/Src/DAL/DatabaseGeneric/EntityClasses/CountryEntity.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates @@ -163,7 +163,7 @@ private void InitClassEmpty(IValidator validator, IEntityFields2 fields) public virtual System.DateTime CreatedOn { get { return (System.DateTime)GetValue((int)CountryFieldIndex.CreatedOn, true); } - set { SetValue((int)CountryFieldIndex.CreatedOn, value); } + set { SetValue((int)CountryFieldIndex.CreatedOn, value); } } /// The Id property of the Entity Country

 @@ -171,7 +171,7 @@ public virtual System.DateTime CreatedOn public virtual System.String Id { get { return (System.String)GetValue((int)CountryFieldIndex.Id, true); } - set { SetValue((int)CountryFieldIndex.Id, value); } + set { SetValue((int)CountryFieldIndex.Id, value); } } /// The Iso3 property of the Entity Country

 @@ -179,7 +179,7 @@ public virtual System.String Id public virtual System.String Iso3 { get { return (System.String)GetValue((int)CountryFieldIndex.Iso3, true); } - set { SetValue((int)CountryFieldIndex.Iso3, value); } + set { SetValue((int)CountryFieldIndex.Iso3, value); } } /// The ModifiedOn property of the Entity Country

 @@ -187,7 +187,7 @@ public virtual System.String Iso3 public virtual System.DateTime ModifiedOn { get { return (System.DateTime)GetValue((int)CountryFieldIndex.ModifiedOn, true); } - set { SetValue((int)CountryFieldIndex.ModifiedOn, value); } + set { SetValue((int)CountryFieldIndex.ModifiedOn, value); } } /// The Name property of the Entity Country

 @@ -195,7 +195,7 @@ public virtual System.DateTime ModifiedOn public virtual System.String Name { get { return (System.String)GetValue((int)CountryFieldIndex.Name, true); } - set { SetValue((int)CountryFieldIndex.Name, value); } + set { SetValue((int)CountryFieldIndex.Name, value); } } /// The NameEn property of the Entity Country

 @@ -203,7 +203,7 @@ public virtual System.String Name public virtual System.String NameEn { get { return (System.String)GetValue((int)CountryFieldIndex.NameEn, true); } - set { SetValue((int)CountryFieldIndex.NameEn, value); } + set { SetValue((int)CountryFieldIndex.NameEn, value); } } /// Gets the EntityCollection with the related entities of type 'CalendarEntity' which are related to this entity via a relation of type '1:n'. If the EntityCollection hasn't been fetched yet, the collection returned will be empty.

 diff --git a/Src/DAL/DatabaseGeneric/EntityClasses/InfoServiceEntity.cs b/Src/DAL/DatabaseGeneric/EntityClasses/InfoServiceEntity.cs index 52145b5..5feaf00 100644 --- a/Src/DAL/DatabaseGeneric/EntityClasses/InfoServiceEntity.cs +++ b/Src/DAL/DatabaseGeneric/EntityClasses/InfoServiceEntity.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates @@ -142,15 +142,7 @@ private void InitClassEmpty(IValidator validator, IEntityFields2 fields) public virtual System.String City { get { return (System.String)GetValue((int)InfoServiceFieldIndex.City, true); } - set { SetValue((int)InfoServiceFieldIndex.City, value); } - } - - /// The ClubName property of the Entity InfoService

 - /// Mapped on table field: "InfoService"."ClubName".
Table field type characteristics (type, precision, scale, length): NVarChar, 0, 0, 255.
Table field behavior characteristics (is nullable, is PK, is identity): false, false, false - public virtual System.String ClubName - { - get { return (System.String)GetValue((int)InfoServiceFieldIndex.ClubName, true); } - set { SetValue((int)InfoServiceFieldIndex.ClubName, value); } + set { SetValue((int)InfoServiceFieldIndex.City, value); } } /// The Comments property of the Entity InfoService

 @@ -158,7 +150,7 @@ public virtual System.String ClubName public virtual System.String Comments { get { return (System.String)GetValue((int)InfoServiceFieldIndex.Comments, true); } - set { SetValue((int)InfoServiceFieldIndex.Comments, value); } + set { SetValue((int)InfoServiceFieldIndex.Comments, value); } } /// The ConfirmedOn property of the Entity InfoService

 @@ -166,7 +158,7 @@ public virtual System.String Comments public virtual Nullable ConfirmedOn { get { return (Nullable)GetValue((int)InfoServiceFieldIndex.ConfirmedOn, false); } - set { SetValue((int)InfoServiceFieldIndex.ConfirmedOn, value); } + set { SetValue((int)InfoServiceFieldIndex.ConfirmedOn, value); } } /// The CountryId property of the Entity InfoService

 @@ -174,7 +166,7 @@ public virtual Nullable ConfirmedOn public virtual System.String CountryId { get { return (System.String)GetValue((int)InfoServiceFieldIndex.CountryId, true); } - set { SetValue((int)InfoServiceFieldIndex.CountryId, value); } + set { SetValue((int)InfoServiceFieldIndex.CountryId, value); } } /// The Email property of the Entity InfoService

 @@ -182,7 +174,7 @@ public virtual System.String CountryId public virtual System.String Email { get { return (System.String)GetValue((int)InfoServiceFieldIndex.Email, true); } - set { SetValue((int)InfoServiceFieldIndex.Email, value); } + set { SetValue((int)InfoServiceFieldIndex.Email, value); } } /// The FirstName property of the Entity InfoService

 @@ -190,7 +182,7 @@ public virtual System.String Email public virtual System.String FirstName { get { return (System.String)GetValue((int)InfoServiceFieldIndex.FirstName, true); } - set { SetValue((int)InfoServiceFieldIndex.FirstName, value); } + set { SetValue((int)InfoServiceFieldIndex.FirstName, value); } } /// The Gender property of the Entity InfoService

 @@ -198,7 +190,7 @@ public virtual System.String FirstName public virtual System.String Gender { get { return (System.String)GetValue((int)InfoServiceFieldIndex.Gender, true); } - set { SetValue((int)InfoServiceFieldIndex.Gender, value); } + set { SetValue((int)InfoServiceFieldIndex.Gender, value); } } /// The Guid property of the Entity InfoService

 @@ -206,7 +198,7 @@ public virtual System.String Gender public virtual System.String Guid { get { return (System.String)GetValue((int)InfoServiceFieldIndex.Guid, true); } - set { SetValue((int)InfoServiceFieldIndex.Guid, value); } + set { SetValue((int)InfoServiceFieldIndex.Guid, value); } } /// The Id property of the Entity InfoService

 @@ -214,14 +206,15 @@ public virtual System.String Guid public virtual System.Int32 Id { get { return (System.Int32)GetValue((int)InfoServiceFieldIndex.Id, true); } - set { SetValue((int)InfoServiceFieldIndex.Id, value); } } + set { SetValue((int)InfoServiceFieldIndex.Id, value); } + } /// The LastName property of the Entity InfoService

 /// Mapped on table field: "InfoService"."LastName".
Table field type characteristics (type, precision, scale, length): NVarChar, 0, 0, 50.
Table field behavior characteristics (is nullable, is PK, is identity): false, false, false public virtual System.String LastName { get { return (System.String)GetValue((int)InfoServiceFieldIndex.LastName, true); } - set { SetValue((int)InfoServiceFieldIndex.LastName, value); } + set { SetValue((int)InfoServiceFieldIndex.LastName, value); } } /// The Latitude property of the Entity InfoService

 @@ -229,7 +222,7 @@ public virtual System.String LastName public virtual Nullable Latitude { get { return (Nullable)GetValue((int)InfoServiceFieldIndex.Latitude, false); } - set { SetValue((int)InfoServiceFieldIndex.Latitude, value); } + set { SetValue((int)InfoServiceFieldIndex.Latitude, value); } } /// The Longitude property of the Entity InfoService

 @@ -237,7 +230,7 @@ public virtual Nullable Latitude public virtual Nullable Longitude { get { return (Nullable)GetValue((int)InfoServiceFieldIndex.Longitude, false); } - set { SetValue((int)InfoServiceFieldIndex.Longitude, value); } + set { SetValue((int)InfoServiceFieldIndex.Longitude, value); } } /// The MaxDistance property of the Entity InfoService

 @@ -245,7 +238,7 @@ public virtual Nullable Longitude public virtual Nullable MaxDistance { get { return (Nullable)GetValue((int)InfoServiceFieldIndex.MaxDistance, false); } - set { SetValue((int)InfoServiceFieldIndex.MaxDistance, value); } + set { SetValue((int)InfoServiceFieldIndex.MaxDistance, value); } } /// The ModifiedOn property of the Entity InfoService

 @@ -253,15 +246,7 @@ public virtual Nullable MaxDistance public virtual System.DateTime ModifiedOn { get { return (System.DateTime)GetValue((int)InfoServiceFieldIndex.ModifiedOn, true); } - set { SetValue((int)InfoServiceFieldIndex.ModifiedOn, value); } - } - - /// The Nickname property of the Entity InfoService

 - /// Mapped on table field: "InfoService"."Nickname".
Table field type characteristics (type, precision, scale, length): NVarChar, 0, 0, 50.
Table field behavior characteristics (is nullable, is PK, is identity): false, false, false - public virtual System.String Nickname - { - get { return (System.String)GetValue((int)InfoServiceFieldIndex.Nickname, true); } - set { SetValue((int)InfoServiceFieldIndex.Nickname, value); } + set { SetValue((int)InfoServiceFieldIndex.ModifiedOn, value); } } /// The Street property of the Entity InfoService

 @@ -269,7 +254,7 @@ public virtual System.String Nickname public virtual System.String Street { get { return (System.String)GetValue((int)InfoServiceFieldIndex.Street, true); } - set { SetValue((int)InfoServiceFieldIndex.Street, value); } + set { SetValue((int)InfoServiceFieldIndex.Street, value); } } /// The SubscribedOn property of the Entity InfoService

 @@ -277,15 +262,7 @@ public virtual System.String Street public virtual System.DateTime SubscribedOn { get { return (System.DateTime)GetValue((int)InfoServiceFieldIndex.SubscribedOn, true); } - set { SetValue((int)InfoServiceFieldIndex.SubscribedOn, value); } - } - - /// The TeamName property of the Entity InfoService

 - /// Mapped on table field: "InfoService"."TeamName".
Table field type characteristics (type, precision, scale, length): NVarChar, 0, 0, 255.
Table field behavior characteristics (is nullable, is PK, is identity): false, false, false - public virtual System.String TeamName - { - get { return (System.String)GetValue((int)InfoServiceFieldIndex.TeamName, true); } - set { SetValue((int)InfoServiceFieldIndex.TeamName, value); } + set { SetValue((int)InfoServiceFieldIndex.SubscribedOn, value); } } /// The Title property of the Entity InfoService

 @@ -293,15 +270,7 @@ public virtual System.String TeamName public virtual System.String Title { get { return (System.String)GetValue((int)InfoServiceFieldIndex.Title, true); } - set { SetValue((int)InfoServiceFieldIndex.Title, value); } - } - - /// The UnSubscribedOn property of the Entity InfoService

 - /// Mapped on table field: "InfoService"."UnSubscribedOn".
Table field type characteristics (type, precision, scale, length): DateTime, 0, 0, 0.
Table field behavior characteristics (is nullable, is PK, is identity): true, false, false - public virtual Nullable UnSubscribedOn - { - get { return (Nullable)GetValue((int)InfoServiceFieldIndex.UnSubscribedOn, false); } - set { SetValue((int)InfoServiceFieldIndex.UnSubscribedOn, value); } + set { SetValue((int)InfoServiceFieldIndex.Title, value); } } /// The UserName property of the Entity InfoService

 @@ -309,15 +278,15 @@ public virtual Nullable UnSubscribedOn public virtual System.String UserName { get { return (System.String)GetValue((int)InfoServiceFieldIndex.UserName, true); } - set { SetValue((int)InfoServiceFieldIndex.UserName, value); } + set { SetValue((int)InfoServiceFieldIndex.UserName, value); } } /// The UserPassword property of the Entity InfoService

 - /// Mapped on table field: "InfoService"."UserPassword".
Table field type characteristics (type, precision, scale, length): NVarChar, 0, 0, 10.
Table field behavior characteristics (is nullable, is PK, is identity): false, false, false + /// Mapped on table field: "InfoService"."UserPassword".
Table field type characteristics (type, precision, scale, length): NVarChar, 0, 0, 50.
Table field behavior characteristics (is nullable, is PK, is identity): false, false, false public virtual System.String UserPassword { get { return (System.String)GetValue((int)InfoServiceFieldIndex.UserPassword, true); } - set { SetValue((int)InfoServiceFieldIndex.UserPassword, value); } + set { SetValue((int)InfoServiceFieldIndex.UserPassword, value); } } /// The ZipCode property of the Entity InfoService

 @@ -325,7 +294,7 @@ public virtual System.String UserPassword public virtual System.String ZipCode { get { return (System.String)GetValue((int)InfoServiceFieldIndex.ZipCode, true); } - set { SetValue((int)InfoServiceFieldIndex.ZipCode, value); } + set { SetValue((int)InfoServiceFieldIndex.ZipCode, value); } } /// Gets / sets related entity of type 'CountryEntity' which has to be set using a fetch action earlier. If no related entity is set for this property, null is returned..

 @@ -348,8 +317,6 @@ public enum InfoServiceFieldIndex { ///City. City, - ///ClubName. - ClubName, ///Comments. Comments, ///ConfirmedOn. @@ -376,18 +343,12 @@ public enum InfoServiceFieldIndex MaxDistance, ///ModifiedOn. ModifiedOn, - ///Nickname. - Nickname, ///Street. Street, ///SubscribedOn. SubscribedOn, - ///TeamName. - TeamName, ///Title. Title, - ///UnSubscribedOn. - UnSubscribedOn, ///UserName. UserName, ///UserPassword. diff --git a/Src/DAL/DatabaseGeneric/EntityClasses/PlayingAbilityEntity.cs b/Src/DAL/DatabaseGeneric/EntityClasses/PlayingAbilityEntity.cs index ce65e92..c1c3ee8 100644 --- a/Src/DAL/DatabaseGeneric/EntityClasses/PlayingAbilityEntity.cs +++ b/Src/DAL/DatabaseGeneric/EntityClasses/PlayingAbilityEntity.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates @@ -163,7 +163,7 @@ private void InitClassEmpty(IValidator validator, IEntityFields2 fields) public virtual System.DateTime CreatedOn { get { return (System.DateTime)GetValue((int)PlayingAbilityFieldIndex.CreatedOn, true); } - set { SetValue((int)PlayingAbilityFieldIndex.CreatedOn, value); } + set { SetValue((int)PlayingAbilityFieldIndex.CreatedOn, value); } } /// The Description property of the Entity PlayingAbility

 @@ -171,7 +171,7 @@ public virtual System.DateTime CreatedOn public virtual System.String Description { get { return (System.String)GetValue((int)PlayingAbilityFieldIndex.Description, true); } - set { SetValue((int)PlayingAbilityFieldIndex.Description, value); } + set { SetValue((int)PlayingAbilityFieldIndex.Description, value); } } /// The Id property of the Entity PlayingAbility

 @@ -179,6 +179,7 @@ public virtual System.String Description public virtual System.Int64 Id { get { return (System.Int64)GetValue((int)PlayingAbilityFieldIndex.Id, true); } + } /// The ModifiedOn property of the Entity PlayingAbility

 @@ -186,7 +187,7 @@ public virtual System.Int64 Id public virtual System.DateTime ModifiedOn { get { return (System.DateTime)GetValue((int)PlayingAbilityFieldIndex.ModifiedOn, true); } - set { SetValue((int)PlayingAbilityFieldIndex.ModifiedOn, value); } + set { SetValue((int)PlayingAbilityFieldIndex.ModifiedOn, value); } } /// The Strength property of the Entity PlayingAbility

 @@ -194,7 +195,7 @@ public virtual System.DateTime ModifiedOn public virtual System.Int64 Strength { get { return (System.Int64)GetValue((int)PlayingAbilityFieldIndex.Strength, true); } - set { SetValue((int)PlayingAbilityFieldIndex.Strength, value); } + set { SetValue((int)PlayingAbilityFieldIndex.Strength, value); } } /// Gets the EntityCollection with the related entities of type 'CalendarEntity' which are related to this entity via a relation of type '1:n'. If the EntityCollection hasn't been fetched yet, the collection returned will be empty.

 diff --git a/Src/DAL/DatabaseGeneric/EntityClasses/SentNewsletterEntity.cs b/Src/DAL/DatabaseGeneric/EntityClasses/SentNewsletterEntity.cs index 8856663..2ab0262 100644 --- a/Src/DAL/DatabaseGeneric/EntityClasses/SentNewsletterEntity.cs +++ b/Src/DAL/DatabaseGeneric/EntityClasses/SentNewsletterEntity.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates @@ -130,7 +130,7 @@ private void InitClassEmpty(IValidator validator, IEntityFields2 fields) public virtual Nullable CompletedOn { get { return (Nullable)GetValue((int)SentNewsletterFieldIndex.CompletedOn, false); } - set { SetValue((int)SentNewsletterFieldIndex.CompletedOn, value); } + set { SetValue((int)SentNewsletterFieldIndex.CompletedOn, value); } } /// The Id property of the Entity SentNewsletter

 @@ -138,14 +138,15 @@ public virtual Nullable CompletedOn public virtual System.Int64 Id { get { return (System.Int64)GetValue((int)SentNewsletterFieldIndex.Id, true); } - set { SetValue((int)SentNewsletterFieldIndex.Id, value); } } + set { SetValue((int)SentNewsletterFieldIndex.Id, value); } + } /// The NumOfRecipients property of the Entity SentNewsletter

 /// Mapped on table field: "SentNewsletters"."NumOfRecipients".
Table field type characteristics (type, precision, scale, length): Int, 10, 0, 0.
Table field behavior characteristics (is nullable, is PK, is identity): false, false, false public virtual System.Int32 NumOfRecipients { get { return (System.Int32)GetValue((int)SentNewsletterFieldIndex.NumOfRecipients, true); } - set { SetValue((int)SentNewsletterFieldIndex.NumOfRecipients, value); } + set { SetValue((int)SentNewsletterFieldIndex.NumOfRecipients, value); } } /// The NumOfTournaments property of the Entity SentNewsletter

 @@ -153,7 +154,7 @@ public virtual System.Int32 NumOfRecipients public virtual System.Int32 NumOfTournaments { get { return (System.Int32)GetValue((int)SentNewsletterFieldIndex.NumOfTournaments, true); } - set { SetValue((int)SentNewsletterFieldIndex.NumOfTournaments, value); } + set { SetValue((int)SentNewsletterFieldIndex.NumOfTournaments, value); } } /// The StartedOn property of the Entity SentNewsletter

 @@ -161,7 +162,7 @@ public virtual System.Int32 NumOfTournaments public virtual System.DateTime StartedOn { get { return (System.DateTime)GetValue((int)SentNewsletterFieldIndex.StartedOn, true); } - set { SetValue((int)SentNewsletterFieldIndex.StartedOn, value); } + set { SetValue((int)SentNewsletterFieldIndex.StartedOn, value); } } // __LLBLGENPRO_USER_CODE_REGION_START CustomEntityCode diff --git a/Src/DAL/DatabaseGeneric/EntityClasses/SurfaceEntity.cs b/Src/DAL/DatabaseGeneric/EntityClasses/SurfaceEntity.cs index 867da10..9c22868 100644 --- a/Src/DAL/DatabaseGeneric/EntityClasses/SurfaceEntity.cs +++ b/Src/DAL/DatabaseGeneric/EntityClasses/SurfaceEntity.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates @@ -142,14 +142,15 @@ private void InitClassEmpty(IValidator validator, IEntityFields2 fields) public virtual System.Int64 Id { get { return (System.Int64)GetValue((int)SurfaceFieldIndex.Id, true); } - set { SetValue((int)SurfaceFieldIndex.Id, value); } } + set { SetValue((int)SurfaceFieldIndex.Id, value); } + } /// The Description property of the Entity Surface

 /// Mapped on table field: "Surface"."Description".
Table field type characteristics (type, precision, scale, length): NVarChar, 0, 0, 255.
Table field behavior characteristics (is nullable, is PK, is identity): false, false, false public virtual System.String Description { get { return (System.String)GetValue((int)SurfaceFieldIndex.Description, true); } - set { SetValue((int)SurfaceFieldIndex.Description, value); } + set { SetValue((int)SurfaceFieldIndex.Description, value); } } /// The CreatedOn property of the Entity Surface

 @@ -157,7 +158,7 @@ public virtual System.String Description public virtual System.DateTime CreatedOn { get { return (System.DateTime)GetValue((int)SurfaceFieldIndex.CreatedOn, true); } - set { SetValue((int)SurfaceFieldIndex.CreatedOn, value); } + set { SetValue((int)SurfaceFieldIndex.CreatedOn, value); } } /// The ModifiedOn property of the Entity Surface

 @@ -165,7 +166,7 @@ public virtual System.DateTime CreatedOn public virtual System.DateTime ModifiedOn { get { return (System.DateTime)GetValue((int)SurfaceFieldIndex.ModifiedOn, true); } - set { SetValue((int)SurfaceFieldIndex.ModifiedOn, value); } + set { SetValue((int)SurfaceFieldIndex.ModifiedOn, value); } } /// Gets the EntityCollection with the related entities of type 'CalendarEntity' which are related to this entity via a relation of type '1:n'. If the EntityCollection hasn't been fetched yet, the collection returned will be empty.

 diff --git a/Src/DAL/DatabaseGeneric/FactoryClasses/EntityFactories.cs b/Src/DAL/DatabaseGeneric/FactoryClasses/EntityFactories.cs index f76ac35..d53d6b2 100644 --- a/Src/DAL/DatabaseGeneric/FactoryClasses/EntityFactories.cs +++ b/Src/DAL/DatabaseGeneric/FactoryClasses/EntityFactories.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseGeneric/FactoryClasses/QueryFactory.cs b/Src/DAL/DatabaseGeneric/FactoryClasses/QueryFactory.cs index f7c90c5..173d423 100644 --- a/Src/DAL/DatabaseGeneric/FactoryClasses/QueryFactory.cs +++ b/Src/DAL/DatabaseGeneric/FactoryClasses/QueryFactory.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseGeneric/HelperClasses/DynamicRelation.cs b/Src/DAL/DatabaseGeneric/HelperClasses/DynamicRelation.cs index 4c5a8d8..72f97ae 100644 --- a/Src/DAL/DatabaseGeneric/HelperClasses/DynamicRelation.cs +++ b/Src/DAL/DatabaseGeneric/HelperClasses/DynamicRelation.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseGeneric/HelperClasses/EntityCollection.cs b/Src/DAL/DatabaseGeneric/HelperClasses/EntityCollection.cs index 93767fb..703cdd6 100644 --- a/Src/DAL/DatabaseGeneric/HelperClasses/EntityCollection.cs +++ b/Src/DAL/DatabaseGeneric/HelperClasses/EntityCollection.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseGeneric/HelperClasses/FieldCreationClasses.cs b/Src/DAL/DatabaseGeneric/HelperClasses/FieldCreationClasses.cs index 04975fb..95867c5 100644 --- a/Src/DAL/DatabaseGeneric/HelperClasses/FieldCreationClasses.cs +++ b/Src/DAL/DatabaseGeneric/HelperClasses/FieldCreationClasses.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates @@ -113,8 +113,6 @@ public partial class InfoServiceFields { /// Creates a new InfoServiceEntity.City field instance public static EntityField2 City { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.City); }} - /// Creates a new InfoServiceEntity.ClubName field instance - public static EntityField2 ClubName { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.ClubName); }} /// Creates a new InfoServiceEntity.Comments field instance public static EntityField2 Comments { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.Comments); }} /// Creates a new InfoServiceEntity.ConfirmedOn field instance @@ -141,18 +139,12 @@ public partial class InfoServiceFields public static EntityField2 MaxDistance { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.MaxDistance); }} /// Creates a new InfoServiceEntity.ModifiedOn field instance public static EntityField2 ModifiedOn { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.ModifiedOn); }} - /// Creates a new InfoServiceEntity.Nickname field instance - public static EntityField2 Nickname { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.Nickname); }} /// Creates a new InfoServiceEntity.Street field instance public static EntityField2 Street { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.Street); }} /// Creates a new InfoServiceEntity.SubscribedOn field instance public static EntityField2 SubscribedOn { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.SubscribedOn); }} - /// Creates a new InfoServiceEntity.TeamName field instance - public static EntityField2 TeamName { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.TeamName); }} /// Creates a new InfoServiceEntity.Title field instance public static EntityField2 Title { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.Title); }} - /// Creates a new InfoServiceEntity.UnSubscribedOn field instance - public static EntityField2 UnSubscribedOn { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.UnSubscribedOn); }} /// Creates a new InfoServiceEntity.UserName field instance public static EntityField2 UserName { get { return ModelInfoProviderSingleton.GetInstance().CreateField2(InfoServiceFieldIndex.UserName); }} /// Creates a new InfoServiceEntity.UserPassword field instance diff --git a/Src/DAL/DatabaseGeneric/HelperClasses/LinqMetaData.cs b/Src/DAL/DatabaseGeneric/HelperClasses/LinqMetaData.cs index 0af5123..1284a1f 100644 --- a/Src/DAL/DatabaseGeneric/HelperClasses/LinqMetaData.cs +++ b/Src/DAL/DatabaseGeneric/HelperClasses/LinqMetaData.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseGeneric/HelperClasses/ModelInfoProvider.cs b/Src/DAL/DatabaseGeneric/HelperClasses/ModelInfoProvider.cs index 1934264..6a85159 100644 --- a/Src/DAL/DatabaseGeneric/HelperClasses/ModelInfoProvider.cs +++ b/Src/DAL/DatabaseGeneric/HelperClasses/ModelInfoProvider.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro v5.9. +// This code was generated by LLBLGen Pro v5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates @@ -111,7 +111,6 @@ private void InitInfoServiceEntityInfo() { this.AddFieldIndexEnumForElementName(typeof(InfoServiceFieldIndex), "InfoServiceEntity"); this.AddElementFieldInfo("InfoServiceEntity", "City", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.City, 50, 0, 0); - this.AddElementFieldInfo("InfoServiceEntity", "ClubName", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.ClubName, 255, 0, 0); this.AddElementFieldInfo("InfoServiceEntity", "Comments", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.Comments, 255, 0, 0); this.AddElementFieldInfo("InfoServiceEntity", "ConfirmedOn", typeof(Nullable), false, false, false, true, (int)InfoServiceFieldIndex.ConfirmedOn, 0, 0, 0); this.AddElementFieldInfo("InfoServiceEntity", "CountryId", typeof(System.String), false, true, false, true, (int)InfoServiceFieldIndex.CountryId, 2, 0, 0); @@ -125,14 +124,11 @@ private void InitInfoServiceEntityInfo() this.AddElementFieldInfo("InfoServiceEntity", "Longitude", typeof(Nullable), false, false, false, true, (int)InfoServiceFieldIndex.Longitude, 0, 0, 38); this.AddElementFieldInfo("InfoServiceEntity", "MaxDistance", typeof(Nullable), false, false, false, true, (int)InfoServiceFieldIndex.MaxDistance, 0, 0, 10); this.AddElementFieldInfo("InfoServiceEntity", "ModifiedOn", typeof(System.DateTime), false, false, false, false, (int)InfoServiceFieldIndex.ModifiedOn, 0, 0, 0); - this.AddElementFieldInfo("InfoServiceEntity", "Nickname", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.Nickname, 50, 0, 0); this.AddElementFieldInfo("InfoServiceEntity", "Street", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.Street, 255, 0, 0); this.AddElementFieldInfo("InfoServiceEntity", "SubscribedOn", typeof(System.DateTime), false, false, false, false, (int)InfoServiceFieldIndex.SubscribedOn, 0, 0, 0); - this.AddElementFieldInfo("InfoServiceEntity", "TeamName", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.TeamName, 255, 0, 0); this.AddElementFieldInfo("InfoServiceEntity", "Title", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.Title, 30, 0, 0); - this.AddElementFieldInfo("InfoServiceEntity", "UnSubscribedOn", typeof(Nullable), false, false, false, true, (int)InfoServiceFieldIndex.UnSubscribedOn, 0, 0, 0); this.AddElementFieldInfo("InfoServiceEntity", "UserName", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.UserName, 50, 0, 0); - this.AddElementFieldInfo("InfoServiceEntity", "UserPassword", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.UserPassword, 10, 0, 0); + this.AddElementFieldInfo("InfoServiceEntity", "UserPassword", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.UserPassword, 50, 0, 0); this.AddElementFieldInfo("InfoServiceEntity", "ZipCode", typeof(System.String), false, false, false, false, (int)InfoServiceFieldIndex.ZipCode, 6, 0, 0); } diff --git a/Src/DAL/DatabaseGeneric/HelperClasses/ResultsetFields.cs b/Src/DAL/DatabaseGeneric/HelperClasses/ResultsetFields.cs index e901d20..5c9bce2 100644 --- a/Src/DAL/DatabaseGeneric/HelperClasses/ResultsetFields.cs +++ b/Src/DAL/DatabaseGeneric/HelperClasses/ResultsetFields.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseGeneric/HelperClasses/TypeDefaultValue.cs b/Src/DAL/DatabaseGeneric/HelperClasses/TypeDefaultValue.cs index 8e5d634..04b41ac 100644 --- a/Src/DAL/DatabaseGeneric/HelperClasses/TypeDefaultValue.cs +++ b/Src/DAL/DatabaseGeneric/HelperClasses/TypeDefaultValue.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseSpecific/ActionProcedures.cs b/Src/DAL/DatabaseSpecific/ActionProcedures.cs index 9dc1f44..c5cf012 100644 --- a/Src/DAL/DatabaseSpecific/ActionProcedures.cs +++ b/Src/DAL/DatabaseSpecific/ActionProcedures.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseSpecific/DataAccessAdapter.cs b/Src/DAL/DatabaseSpecific/DataAccessAdapter.cs index 16782bd..4967870 100644 --- a/Src/DAL/DatabaseSpecific/DataAccessAdapter.cs +++ b/Src/DAL/DatabaseSpecific/DataAccessAdapter.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/DatabaseSpecific/PersistenceInfoProvider.cs b/Src/DAL/DatabaseSpecific/PersistenceInfoProvider.cs index 288f5f7..dd799a8 100644 --- a/Src/DAL/DatabaseSpecific/PersistenceInfoProvider.cs +++ b/Src/DAL/DatabaseSpecific/PersistenceInfoProvider.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro v5.9. +// This code was generated by LLBLGen Pro v5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates @@ -103,31 +103,27 @@ private void InitCountryEntityMappings() /// Inits InfoServiceEntity's mappings private void InitInfoServiceEntityMappings() { - this.AddElementMapping("InfoServiceEntity", @"TournamentCalendar", @"dbo", "InfoService", 24, 0); + this.AddElementMapping("InfoServiceEntity", @"TournamentCalendar", @"dbo", "InfoService", 20, 0); this.AddElementFieldMapping("InfoServiceEntity", "City", "City", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 0); - this.AddElementFieldMapping("InfoServiceEntity", "ClubName", "ClubName", false, "NVarChar", 255, 0, 0, false, "", null, typeof(System.String), 1); - this.AddElementFieldMapping("InfoServiceEntity", "Comments", "Comments", false, "NVarChar", 255, 0, 0, false, "", null, typeof(System.String), 2); - this.AddElementFieldMapping("InfoServiceEntity", "ConfirmedOn", "ConfirmedOn", true, "DateTime", 0, 0, 0, false, "", null, typeof(System.DateTime), 3); - this.AddElementFieldMapping("InfoServiceEntity", "CountryId", "CountryId", true, "NVarChar", 2, 0, 0, false, "", null, typeof(System.String), 4); - this.AddElementFieldMapping("InfoServiceEntity", "Email", "Email", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 5); - this.AddElementFieldMapping("InfoServiceEntity", "FirstName", "FirstName", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 6); - this.AddElementFieldMapping("InfoServiceEntity", "Gender", "Gender", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 7); - this.AddElementFieldMapping("InfoServiceEntity", "Guid", "Guid", true, "NVarChar", 64, 0, 0, false, "", null, typeof(System.String), 8); - this.AddElementFieldMapping("InfoServiceEntity", "Id", "Id", false, "Int", 0, 10, 0, true, "SCOPE_IDENTITY()", null, typeof(System.Int32), 9); - this.AddElementFieldMapping("InfoServiceEntity", "LastName", "LastName", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 10); - this.AddElementFieldMapping("InfoServiceEntity", "Latitude", "Latitude", true, "Float", 0, 38, 0, false, "", null, typeof(System.Double), 11); - this.AddElementFieldMapping("InfoServiceEntity", "Longitude", "Longitude", true, "Float", 0, 38, 0, false, "", null, typeof(System.Double), 12); - this.AddElementFieldMapping("InfoServiceEntity", "MaxDistance", "MaxDistance", true, "Int", 0, 10, 0, false, "", null, typeof(System.Int32), 13); - this.AddElementFieldMapping("InfoServiceEntity", "ModifiedOn", "ModifiedOn", false, "DateTime", 0, 0, 0, false, "", null, typeof(System.DateTime), 14); - this.AddElementFieldMapping("InfoServiceEntity", "Nickname", "Nickname", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 15); - this.AddElementFieldMapping("InfoServiceEntity", "Street", "Street", false, "NVarChar", 255, 0, 0, false, "", null, typeof(System.String), 16); - this.AddElementFieldMapping("InfoServiceEntity", "SubscribedOn", "SubscribedOn", false, "DateTime", 0, 0, 0, false, "", null, typeof(System.DateTime), 17); - this.AddElementFieldMapping("InfoServiceEntity", "TeamName", "TeamName", false, "NVarChar", 255, 0, 0, false, "", null, typeof(System.String), 18); - this.AddElementFieldMapping("InfoServiceEntity", "Title", "Title", false, "NVarChar", 30, 0, 0, false, "", null, typeof(System.String), 19); - this.AddElementFieldMapping("InfoServiceEntity", "UnSubscribedOn", "UnSubscribedOn", true, "DateTime", 0, 0, 0, false, "", null, typeof(System.DateTime), 20); - this.AddElementFieldMapping("InfoServiceEntity", "UserName", "UserName", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 21); - this.AddElementFieldMapping("InfoServiceEntity", "UserPassword", "UserPassword", false, "NVarChar", 10, 0, 0, false, "", null, typeof(System.String), 22); - this.AddElementFieldMapping("InfoServiceEntity", "ZipCode", "ZipCode", false, "NVarChar", 6, 0, 0, false, "", null, typeof(System.String), 23); + this.AddElementFieldMapping("InfoServiceEntity", "Comments", "Comments", false, "NVarChar", 255, 0, 0, false, "", null, typeof(System.String), 1); + this.AddElementFieldMapping("InfoServiceEntity", "ConfirmedOn", "ConfirmedOn", true, "DateTime", 0, 0, 0, false, "", null, typeof(System.DateTime), 2); + this.AddElementFieldMapping("InfoServiceEntity", "CountryId", "CountryId", true, "NVarChar", 2, 0, 0, false, "", null, typeof(System.String), 3); + this.AddElementFieldMapping("InfoServiceEntity", "Email", "Email", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 4); + this.AddElementFieldMapping("InfoServiceEntity", "FirstName", "FirstName", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 5); + this.AddElementFieldMapping("InfoServiceEntity", "Gender", "Gender", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 6); + this.AddElementFieldMapping("InfoServiceEntity", "Guid", "Guid", true, "NVarChar", 64, 0, 0, false, "", null, typeof(System.String), 7); + this.AddElementFieldMapping("InfoServiceEntity", "Id", "Id", false, "Int", 0, 10, 0, true, "SCOPE_IDENTITY()", null, typeof(System.Int32), 8); + this.AddElementFieldMapping("InfoServiceEntity", "LastName", "LastName", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 9); + this.AddElementFieldMapping("InfoServiceEntity", "Latitude", "Latitude", true, "Float", 0, 38, 0, false, "", null, typeof(System.Double), 10); + this.AddElementFieldMapping("InfoServiceEntity", "Longitude", "Longitude", true, "Float", 0, 38, 0, false, "", null, typeof(System.Double), 11); + this.AddElementFieldMapping("InfoServiceEntity", "MaxDistance", "MaxDistance", true, "Int", 0, 10, 0, false, "", null, typeof(System.Int32), 12); + this.AddElementFieldMapping("InfoServiceEntity", "ModifiedOn", "ModifiedOn", false, "DateTime", 0, 0, 0, false, "", null, typeof(System.DateTime), 13); + this.AddElementFieldMapping("InfoServiceEntity", "Street", "Street", false, "NVarChar", 255, 0, 0, false, "", null, typeof(System.String), 14); + this.AddElementFieldMapping("InfoServiceEntity", "SubscribedOn", "SubscribedOn", false, "DateTime", 0, 0, 0, false, "", null, typeof(System.DateTime), 15); + this.AddElementFieldMapping("InfoServiceEntity", "Title", "Title", false, "NVarChar", 30, 0, 0, false, "", null, typeof(System.String), 16); + this.AddElementFieldMapping("InfoServiceEntity", "UserName", "UserName", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 17); + this.AddElementFieldMapping("InfoServiceEntity", "UserPassword", "UserPassword", false, "NVarChar", 50, 0, 0, false, "", null, typeof(System.String), 18); + this.AddElementFieldMapping("InfoServiceEntity", "ZipCode", "ZipCode", false, "NVarChar", 6, 0, 0, false, "", null, typeof(System.String), 19); } /// Inits PlayingAbilityEntity's mappings diff --git a/Src/DAL/DatabaseSpecific/RetrievalProcedures.cs b/Src/DAL/DatabaseSpecific/RetrievalProcedures.cs index 3124727..cb16335 100644 --- a/Src/DAL/DatabaseSpecific/RetrievalProcedures.cs +++ b/Src/DAL/DatabaseSpecific/RetrievalProcedures.cs @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////// -// This code was generated by LLBLGen Pro 5.9. +// This code was generated by LLBLGen Pro 5.11. ////////////////////////////////////////////////////////////// // Code is generated on: // Code is generated using templates: SD.TemplateBindings.SharedTemplates diff --git a/Src/DAL/TournamentCalendar-DAL.llblgenproj b/Src/DAL/TournamentCalendar-DAL.llblgenproj index cf50474..5bc9a90 100644 --- a/Src/DAL/TournamentCalendar-DAL.llblgenproj +++ b/Src/DAL/TournamentCalendar-DAL.llblgenproj @@ -1,6 +1,6 @@  - - + + @@ -116,13 +116,13 @@ - + - + - + @@ -243,7 +243,6 @@ - @@ -257,14 +256,11 @@ - - - - + @@ -345,7 +341,7 @@ - + @@ -410,29 +406,25 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - -
@@ -561,7 +553,6 @@ - @@ -575,12 +566,9 @@ - - - diff --git a/Src/TournamentCalendar/Controllers/Calendar.cs b/Src/TournamentCalendar/Controllers/Calendar.cs index e36c728..5ddbabf 100644 --- a/Src/TournamentCalendar/Controllers/Calendar.cs +++ b/Src/TournamentCalendar/Controllers/Calendar.cs @@ -184,7 +184,7 @@ public async Task Approve(string? guid, CancellationToken cancell guid ??= string.Empty; ViewBag.TitleTagText = "Volleyball-Turniereintrag bestätigen"; - var approveModel = new Models.Shared.ApproveModelTournamentCalendar(_appDb,CalendarFields.Guid == guid, CalendarFields.ApprovedOn, CalendarFields.DeletedOn); + var approveModel = new Models.Shared.ApproveModelTournamentCalendar(_appDb,CalendarFields.Guid == guid, CalendarFields.ApprovedOn); return View(ViewName.Calendar.Approve, await approveModel.Save(cancellationToken)); } diff --git a/Src/TournamentCalendar/Controllers/InfoService.cs b/Src/TournamentCalendar/Controllers/InfoService.cs index 31de2e7..65187f5 100644 --- a/Src/TournamentCalendar/Controllers/InfoService.cs +++ b/Src/TournamentCalendar/Controllers/InfoService.cs @@ -115,15 +115,12 @@ public async Task Entry([FromForm] Models.InfoService.EditModel m if (!confirmationModel.SaveSuccessful) return View(ViewName.InfoService.Confirm, confirmationModel); - if (confirmationModel.Entity?.UnSubscribedOn == null) - { - if (model is { Latitude: not null, Longitude: not null }) - _locationService.SetGeoLocation(model.Latitude.Value, model.Longitude.Value); + if (model is { Latitude: not null, Longitude: not null }) + _locationService.SetGeoLocation(model.Latitude.Value, model.Longitude.Value); - confirmationModel = await new Mailer(_mailMergeService, _domainName).MailInfoServiceRegistrationForm(confirmationModel, - Url.Action(nameof(Approve), nameof(Controllers.InfoService), new {guid = model.Guid})!, - Url.Action(nameof(Entry), nameof(Controllers.InfoService), new { guid = model.Guid})!); - } + confirmationModel = await new Mailer(_mailMergeService, _domainName).MailInfoServiceRegistrationForm(confirmationModel, + Url.Action(nameof(Approve), nameof(Controllers.InfoService), new { guid = model.Guid })!, + Url.Action(nameof(Entry), nameof(Controllers.InfoService), new { guid = model.Guid })!); return View(ViewName.InfoService.Confirm, confirmationModel); } @@ -147,7 +144,7 @@ public async Task Unsubscribe([FromForm] Models.InfoService.EditM ViewBag.TitleTagText = "Volley-News abbestellen"; var unsubscribeModel = new Models.InfoService.UnsubscribeModel(_appDb, model.Guid); - return View(ViewName.InfoService.Unsubscribe, await unsubscribeModel.Save(cancellationToken)); + return View(ViewName.InfoService.Unsubscribe, await unsubscribeModel.Delete(cancellationToken)); } [HttpGet("approve/{guid}")] @@ -157,7 +154,7 @@ public async Task Approve(string guid, CancellationToken cancella return View(ViewName.InfoService.Approve, false); ViewBag.TitleTagText = "Volley-News bestätigen"; - var approveModel = new Models.Shared.ApproveModelTournamentCalendar(_appDb,InfoServiceFields.Guid == guid, InfoServiceFields.ConfirmedOn, InfoServiceFields.UnSubscribedOn); + var approveModel = new Models.Shared.ApproveModelTournamentCalendar(_appDb,InfoServiceFields.Guid == guid, InfoServiceFields.ConfirmedOn); return View(ViewName.InfoService.Approve, await approveModel.Save(cancellationToken)); } } diff --git a/Src/TournamentCalendar/Models/Calendar/CalendarEntityDisplayModel.cs b/Src/TournamentCalendar/Models/Calendar/CalendarEntityDisplayModel.cs index 38d6e24..7625af3 100644 --- a/Src/TournamentCalendar/Models/Calendar/CalendarEntityDisplayModel.cs +++ b/Src/TournamentCalendar/Models/Calendar/CalendarEntityDisplayModel.cs @@ -143,8 +143,8 @@ public string GetRouteGoogleMapsLink() return string.Format("https://maps.google.de/maps?saddr={0},{1}&daddr={2},{3}", _userLocation.Latitude!.Value.ToString(LatLonFormat, CultureInfo.InvariantCulture), _userLocation.Longitude!.Value.ToString(LatLonFormat, CultureInfo.InvariantCulture), - Latitude.Value.ToString(LatLonFormat, CultureInfo.InvariantCulture), - Longitude.Value.ToString(LatLonFormat, CultureInfo.InvariantCulture)); + Latitude!.Value.ToString(LatLonFormat, CultureInfo.InvariantCulture), + Longitude!.Value.ToString(LatLonFormat, CultureInfo.InvariantCulture)); } public bool IsGeoSpatial() diff --git a/Src/TournamentCalendar/Models/InfoService/EditModel.cs b/Src/TournamentCalendar/Models/InfoService/EditModel.cs index 386c28e..5db4869 100644 --- a/Src/TournamentCalendar/Models/InfoService/EditModel.cs +++ b/Src/TournamentCalendar/Models/InfoService/EditModel.cs @@ -26,7 +26,6 @@ public EditModel() { base.Guid = string.Empty; // someone who saves changed data is considered as subscriber - base.UnSubscribedOn = null; base.Gender = ""; base.CountryId = ""; base.IsNew = true; @@ -160,9 +159,6 @@ public void Normalize() Fields[i].CurrentValue = Axuno.Tools.String.StringHelper.StripTags(Fields[i].CurrentValue as string ?? string.Empty).Trim(); } - if (string.IsNullOrEmpty(Nickname)) - Nickname = FirstName; - if (MaxDistance.HasValue) { if (MaxDistance < 50) MaxDistance = 50; @@ -189,13 +185,12 @@ public void Normalize() IsNew = true; Guid = System.Guid.NewGuid().ToString("N"); SubscribedOn = ModifiedOn = DateTime.Now; - ConfirmedOn = UnSubscribedOn = null; + ConfirmedOn = null; } else { IsNew = false; ConfirmedOn ??= DateTime.Now; - UnSubscribedOn = null; ModifiedOn = DateTime.Now; } diff --git a/Src/TournamentCalendar/Models/InfoService/UnsubscribeModel.cs b/Src/TournamentCalendar/Models/InfoService/UnsubscribeModel.cs index 531b1b2..f44a38e 100644 --- a/Src/TournamentCalendar/Models/InfoService/UnsubscribeModel.cs +++ b/Src/TournamentCalendar/Models/InfoService/UnsubscribeModel.cs @@ -25,7 +25,7 @@ public static bool IsGuid(string guid) return System.Guid.TryParse(guid, out _); } - public async Task Save(CancellationToken cancellationToken) + public async Task Delete(CancellationToken cancellationToken) { SaveSuccessFul = false; Entity = new InfoServiceEntity(); @@ -35,22 +35,15 @@ public async Task Save(CancellationToken cancellationToken) if (!(IsEntityFound = _appDb.InfoServiceRepository.GetRegistrationByGuid(Entity, Guid))) return this; - // only save dates if not already unsubscribed - if (!Entity.UnSubscribedOn.HasValue) - { - Entity.UnSubscribedOn = Entity.ModifiedOn = DateTime.Now; - Entity.ConfirmedOn = null; - SaveSuccessFul = await _appDb.GenericRepository.Save(Entity, true, cancellationToken); - } - else - { - SaveSuccessFul = true; - } + Entity.ModifiedOn = DateTime.Now; + Entity.ConfirmedOn = null; + SaveSuccessFul = await _appDb.GenericRepository.Delete(Entity, cancellationToken); } catch (Exception ex) { Exception = ex; } + return this; } } diff --git a/Src/TournamentCalendar/Models/Shared/ApproveModelTournamentCalendar.cs b/Src/TournamentCalendar/Models/Shared/ApproveModelTournamentCalendar.cs index f84c816..9c6c0c1 100644 --- a/Src/TournamentCalendar/Models/Shared/ApproveModelTournamentCalendar.cs +++ b/Src/TournamentCalendar/Models/Shared/ApproveModelTournamentCalendar.cs @@ -9,14 +9,12 @@ namespace TournamentCalendar.Models.Shared; private readonly IAppDb _appDb; private readonly IPredicate _filter; private readonly EntityField2 _approveDateField; - private readonly EntityField2 _deletedOnDateField; - public ApproveModelTournamentCalendar(IAppDb appDb, IPredicate filter, EntityField2 approveDateField, EntityField2 deletedOnDateField) + public ApproveModelTournamentCalendar(IAppDb appDb, IPredicate filter, EntityField2 approveDateField) { _appDb = appDb; _filter = filter; _approveDateField = approveDateField; - _deletedOnDateField = deletedOnDateField; SaveSuccessFul = IsEntityFound = false; } public bool SaveSuccessFul { get; set; } @@ -53,11 +51,6 @@ public async Task> Save(CancellationToken canc return this; } - if (Entity.Fields[_deletedOnDateField.Name].CurrentValue is DateTime) - { - Entity.SetNewFieldValue(_deletedOnDateField.Name, null); - } - // only save date if not already approved if (Entity.Fields[_approveDateField.Name].CurrentValue is not DateTime) { diff --git a/Src/TournamentCalendar/Services/UserLocationService.cs b/Src/TournamentCalendar/Services/UserLocationService.cs index 03c336d..4289e71 100644 --- a/Src/TournamentCalendar/Services/UserLocationService.cs +++ b/Src/TournamentCalendar/Services/UserLocationService.cs @@ -85,8 +85,7 @@ public void ClearGeoLocation() public void SetFromUserGuid(Guid userGuid) { var infoService = new InfoServiceEntity(); - if (_appDb.InfoServiceRepository.GetRegistrationByGuid(infoService, userGuid.ToString("N")) - && infoService is { ConfirmedOn: not null, UnSubscribedOn: null, Latitude: not null, Longitude: not null }) + if (_appDb.InfoServiceRepository.GetRegistrationByGuid(infoService, userGuid.ToString("N"))) { SetGeoLocation(infoService.Latitude.Value, infoService.Longitude.Value); return; diff --git a/Src/TournamentCalendar/Views/InfoService/Edit.cshtml b/Src/TournamentCalendar/Views/InfoService/Edit.cshtml index 3179e8a..2a32ce5 100644 --- a/Src/TournamentCalendar/Views/InfoService/Edit.cshtml +++ b/Src/TournamentCalendar/Views/InfoService/Edit.cshtml @@ -135,10 +135,6 @@ { @Model.ModifiedOn.ToString("dd.MM.yyyy - HH:mm:ss") } - @if (Model.UnSubscribedOn.HasValue) - { - - abgemeldet - }
Captcha @@ -152,7 +148,7 @@
- disabled="disabled" } class="cancel col-12 btn btn-lg btn-success" /> + disabled="disabled" } class="cancel col-12 btn btn-lg btn-success" />
diff --git a/Src/TournamentCalendar/Views/InfoService/Unsubscribe.cshtml b/Src/TournamentCalendar/Views/InfoService/Unsubscribe.cshtml index e7fd06a..f0201b1 100644 --- a/Src/TournamentCalendar/Views/InfoService/Unsubscribe.cshtml +++ b/Src/TournamentCalendar/Views/InfoService/Unsubscribe.cshtml @@ -11,7 +11,7 @@ if (Model.SaveSuccessFul) {
- Die Registrierung bei Volley-News für die E-Mail @Model.Entity?.Email wurde beendet. + Die Registrierung bei Volley-News für die E-Mail wurde wie gewünscht beendet.
} else diff --git a/Src/TournamentCalender.Data/GenericRepository.cs b/Src/TournamentCalender.Data/GenericRepository.cs index 5a58a60..f3932d5 100644 --- a/Src/TournamentCalender.Data/GenericRepository.cs +++ b/Src/TournamentCalender.Data/GenericRepository.cs @@ -24,16 +24,21 @@ public virtual async Task Save(T registration, bool refetchAfterSave, C return success; } + public virtual async Task Delete(T registration, CancellationToken cancellationToken) where T : IEntity2 + { + using var da = _dbContext.GetNewAdapter(); + var success = await da.DeleteEntityAsync(registration, cancellationToken); + return success; + } + public virtual bool UpdateDateIfNotSet(T entity, IPredicate filter, EntityField2 field, DateTime date , out bool found) where T: IEntity2, new() { using var da = _dbContext.GetNewAdapter(); if (!(found = da.FetchEntityUsingUniqueConstraint(entity, new PredicateExpression(filter)))) return false; - var approvedDateValue = entity.Fields[field.Name].CurrentValue as DateTime?; - // only save date if not already approved - if (!approvedDateValue.HasValue) + if (!(entity.Fields[field.Name].CurrentValue is DateTime approvedDateValue)) { entity.SetNewFieldValue(field.Name, date); return da.SaveEntity(entity, true); diff --git a/Src/TournamentCalender.Data/InfoServiceRepository.cs b/Src/TournamentCalender.Data/InfoServiceRepository.cs index e9045fe..1ae7f56 100644 --- a/Src/TournamentCalender.Data/InfoServiceRepository.cs +++ b/Src/TournamentCalender.Data/InfoServiceRepository.cs @@ -55,6 +55,6 @@ public virtual int GetIdForGuid(string guid) using var da = _dbContext.GetNewAdapter(); var metaData = new LinqMetaData(da); return await (from subs in metaData.InfoService - where !subs.UnSubscribedOn.HasValue select subs).ExecuteAsync>(); + where subs.ConfirmedOn.HasValue select subs).ExecuteAsync>(); } }