diff --git a/RMuseum/Migrations/20220309160648_MultipleNewFields.Designer.cs b/RMuseum/Migrations/20220311151558_GCatTOCStyle.Designer.cs similarity index 99% rename from RMuseum/Migrations/20220309160648_MultipleNewFields.Designer.cs rename to RMuseum/Migrations/20220311151558_GCatTOCStyle.Designer.cs index a36cc0ee..0ceed6f2 100644 --- a/RMuseum/Migrations/20220309160648_MultipleNewFields.Designer.cs +++ b/RMuseum/Migrations/20220311151558_GCatTOCStyle.Designer.cs @@ -12,14 +12,14 @@ using RMuseum.DbContext; namespace RMuseum.Migrations { [DbContext(typeof(RMuseumDbContext))] - [Migration("20220309160648_MultipleNewFields")] - partial class MultipleNewFields + [Migration("20220311151558_GCatTOCStyle")] + partial class GCatTOCStyle { protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "6.0.2") + .HasAnnotation("ProductVersion", "6.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -1460,9 +1460,6 @@ namespace RMuseum.Migrations b.Property("CoupletIndex") .HasColumnType("int"); - b.Property("Language") - .HasColumnType("nvarchar(max)"); - b.Property("PoemId") .HasColumnType("int"); diff --git a/RMuseum/Migrations/20220309160648_MultipleNewFields.cs b/RMuseum/Migrations/20220311151558_GCatTOCStyle.cs similarity index 89% rename from RMuseum/Migrations/20220309160648_MultipleNewFields.cs rename to RMuseum/Migrations/20220311151558_GCatTOCStyle.cs index a8140460..650c3c60 100644 --- a/RMuseum/Migrations/20220309160648_MultipleNewFields.cs +++ b/RMuseum/Migrations/20220311151558_GCatTOCStyle.cs @@ -4,16 +4,10 @@ namespace RMuseum.Migrations { - public partial class MultipleNewFields : Migration + public partial class GCatTOCStyle : Migration { protected override void Up(MigrationBuilder migrationBuilder) { - migrationBuilder.AddColumn( - name: "Language", - table: "GanjoorVerses", - type: "nvarchar(max)", - nullable: true); - migrationBuilder.AddColumn( name: "Language", table: "GanjoorPoems", @@ -32,7 +26,7 @@ namespace RMuseum.Migrations table: "GanjoorPoems", type: "bit", nullable: false, - defaultValue: true); + defaultValue: false); migrationBuilder.AddColumn( name: "NoIndex", @@ -78,7 +72,7 @@ namespace RMuseum.Migrations table: "GanjoorCategories", type: "bit", nullable: false, - defaultValue: true); + defaultValue: false); migrationBuilder.AddColumn( name: "TableOfContentsStyle", @@ -90,10 +84,6 @@ namespace RMuseum.Migrations protected override void Down(MigrationBuilder migrationBuilder) { - migrationBuilder.DropColumn( - name: "Language", - table: "GanjoorVerses"); - migrationBuilder.DropColumn( name: "Language", table: "GanjoorPoems"); diff --git a/RMuseum/Migrations/RMuseumDbContextModelSnapshot.cs b/RMuseum/Migrations/RMuseumDbContextModelSnapshot.cs index b0330825..ecc30202 100644 --- a/RMuseum/Migrations/RMuseumDbContextModelSnapshot.cs +++ b/RMuseum/Migrations/RMuseumDbContextModelSnapshot.cs @@ -17,7 +17,7 @@ namespace RMuseum.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "6.0.2") + .HasAnnotation("ProductVersion", "6.0.3") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -1458,9 +1458,6 @@ namespace RMuseum.Migrations b.Property("CoupletIndex") .HasColumnType("int"); - b.Property("Language") - .HasColumnType("nvarchar(max)"); - b.Property("PoemId") .HasColumnType("int"); diff --git a/RMuseum/Models/Ganjoor/GanjoorVerse.cs b/RMuseum/Models/Ganjoor/GanjoorVerse.cs index 52a51dd3..e3b565f6 100644 --- a/RMuseum/Models/Ganjoor/GanjoorVerse.cs +++ b/RMuseum/Models/Ganjoor/GanjoorVerse.cs @@ -40,11 +40,6 @@ /// public int? CoupletIndex { get; set; } - /// - /// language (this is intended to affect html page encodings and not determine actuallly accents and ....), so it is unusable for verses I guess - /// - public string Language { get; set; } - public override string ToString() { return Text; diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorVerseViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorVerseViewModel.cs index d40453ef..f9a0dcd1 100644 --- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorVerseViewModel.cs +++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorVerseViewModel.cs @@ -31,11 +31,6 @@ /// public string Text { get; set; } - /// - /// language - /// - public string Language { get; set; } - public override string ToString() { return Text; diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index 45c5d684..73536daf 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -7028,11 +7028,6 @@ couplet index - - - language (this is intended to affect html page encodings and not determine actuallly accents and ....), so it is unusable for verses I guess - - id @@ -8605,11 +8600,6 @@ text - - - language - - Ganjoor Poem related music track model diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs index 317ff5a7..0e97d59b 100644 --- a/RMuseum/Services/Implementation/GanjoorService.cs +++ b/RMuseum/Services/Implementation/GanjoorService.cs @@ -1539,7 +1539,6 @@ namespace RMuseum.Services.Implementation CoupletIndex = v.CoupletIndex, VersePosition = v.VersePosition, Text = v.Text, - Language = v.Language, } ).AsNoTracking().ToArrayAsync(); }; diff --git a/RMuseum/Services/Implementation/GanjoorTranslationService.cs b/RMuseum/Services/Implementation/GanjoorTranslationService.cs index de5d533d..c6636267 100644 --- a/RMuseum/Services/Implementation/GanjoorTranslationService.cs +++ b/RMuseum/Services/Implementation/GanjoorTranslationService.cs @@ -248,7 +248,6 @@ namespace RMuseum.Services.Implementation CoupletIndex = pv.CoupletIndex, VOrder = pv.VOrder, Text = pv.Text, - Language = pv.Language, } ).Single(), TText = v.TText