From 3ecc61de1cd01acb54614fbb504e441395b34685 Mon Sep 17 00:00:00 2001 From: emon Date: Tue, 28 May 2024 19:38:16 +0600 Subject: [PATCH] few bugs fixed in payment --- HomeRentManagement/Data/Payment.cs | 1 + HomeRentManagement/Data/Rental.cs | 1 + HomeRentManagement/Data/RentalService.cs | 2 + .../20240528132650_payment-month.Designer.cs | 533 +++++++++++++++++ .../20240528132650_payment-month.cs | 28 + .../20240528132912_payment-monthd.Designer.cs | 536 ++++++++++++++++++ .../20240528132912_payment-monthd.cs | 28 + .../Migrations/addDbContexModelSnapshot.cs | 6 + HomeRentManagement/Pages/PaymentDetails.razor | 19 +- 9 files changed, 1152 insertions(+), 2 deletions(-) create mode 100644 HomeRentManagement/Migrations/20240528132650_payment-month.Designer.cs create mode 100644 HomeRentManagement/Migrations/20240528132650_payment-month.cs create mode 100644 HomeRentManagement/Migrations/20240528132912_payment-monthd.Designer.cs create mode 100644 HomeRentManagement/Migrations/20240528132912_payment-monthd.cs diff --git a/HomeRentManagement/Data/Payment.cs b/HomeRentManagement/Data/Payment.cs index 6c00575..d5b4738 100644 --- a/HomeRentManagement/Data/Payment.cs +++ b/HomeRentManagement/Data/Payment.cs @@ -7,6 +7,7 @@ public class Payment { [Key] public int PaymentID { get; set; } + public string? PaymentMonth { get; set; } public int UnitID { get; set; } [ForeignKey("UnitID")] diff --git a/HomeRentManagement/Data/Rental.cs b/HomeRentManagement/Data/Rental.cs index dd012d3..3932966 100644 --- a/HomeRentManagement/Data/Rental.cs +++ b/HomeRentManagement/Data/Rental.cs @@ -7,6 +7,7 @@ public class Rental { [Key] public int RentID { get; set; } + public string? RentMont { get; set; } public int TenantID { get; set; } [ForeignKey("TenantID")] diff --git a/HomeRentManagement/Data/RentalService.cs b/HomeRentManagement/Data/RentalService.cs index a343ca7..c5df7c2 100644 --- a/HomeRentManagement/Data/RentalService.cs +++ b/HomeRentManagement/Data/RentalService.cs @@ -66,6 +66,8 @@ public async Task updatedateRent(Rental updateRent,int newUnitId) // Update the properties of the existing member with the new values existingRent.totalRent = updateRent.totalRent; existingRent.TenantID=updateRent.TenantID; + existingRent.RentMont = updateRent.RentMont; + existingRent.RentDate = updateRent.RentDate; diff --git a/HomeRentManagement/Migrations/20240528132650_payment-month.Designer.cs b/HomeRentManagement/Migrations/20240528132650_payment-month.Designer.cs new file mode 100644 index 0000000..7d68617 --- /dev/null +++ b/HomeRentManagement/Migrations/20240528132650_payment-month.Designer.cs @@ -0,0 +1,533 @@ +// +using System; +using HomeRentManagement.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace HomeRentManagement.Migrations +{ + [DbContext(typeof(addDbContex))] + [Migration("20240528132650_payment-month")] + partial class paymentmonth + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.5") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("HomeRentManagement.Data.BillGenerate", b => + { + b.Property("BillingID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("BillingID")); + + b.Property("ElectricityBill") + .HasColumnType("decimal(18,2)"); + + b.Property("GasBill") + .HasColumnType("decimal(18,2)"); + + b.Property("MonthName") + .HasColumnType("nvarchar(max)"); + + b.Property("ServiceCharge") + .HasColumnType("decimal(18,2)"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("TenantID") + .HasColumnType("int"); + + b.Property("TotalRent") + .HasColumnType("decimal(18,2)"); + + b.HasKey("BillingID"); + + b.HasIndex("StatusId"); + + b.HasIndex("TenantID"); + + b.ToTable("BillGenerates"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Floor", b => + { + b.Property("FloorID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("FloorID")); + + b.Property("FloorNumber") + .HasColumnType("int"); + + b.Property("HouseID") + .HasColumnType("int"); + + b.HasKey("FloorID"); + + b.HasIndex("HouseID"); + + b.ToTable("Floors"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.House", b => + { + b.Property("HouseID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("HouseID")); + + b.Property("HouseAddress") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("HouseName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("floorNumber") + .HasColumnType("int"); + + b.HasKey("HouseID"); + + b.HasIndex("OwnerId"); + + b.HasIndex("StatusId"); + + b.ToTable("Houses"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Payment", b => + { + b.Property("PaymentID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("PaymentID")); + + b.Property("PaymentMonth") + .HasColumnType("nvarchar(max)"); + + b.Property("TenantID") + .HasColumnType("int"); + + b.Property("UnitID") + .HasColumnType("int"); + + b.HasKey("PaymentID"); + + b.HasIndex("TenantID"); + + b.HasIndex("UnitID"); + + b.ToTable("Payments"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Rental", b => + { + b.Property("RentID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("RentID")); + + b.Property("RentDate") + .HasColumnType("datetime2"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("TenantID") + .HasColumnType("int"); + + b.Property("totalRent") + .HasColumnType("decimal(18,2)"); + + b.HasKey("RentID"); + + b.HasIndex("TenantID"); + + b.ToTable("Rentals"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ShortForm") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("Title") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("StatusId"); + + b.ToTable("Roles"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Status", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ShorForm") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Statuss"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Tenant", b => + { + b.Property("TenantID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("TenantID")); + + b.Property("HomeId") + .HasColumnType("int"); + + b.Property("IdCardNumber") + .HasColumnType("nvarchar(max)"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PhoneNumber") + .HasColumnType("nvarchar(max)"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("TenantName") + .HasColumnType("nvarchar(max)"); + + b.Property("UnitID") + .HasColumnType("int"); + + b.HasKey("TenantID"); + + b.HasIndex("HomeId"); + + b.HasIndex("OwnerId"); + + b.HasIndex("StatusId"); + + b.HasIndex("UnitID"); + + b.ToTable("Tenants"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Unit", b => + { + b.Property("UnitID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("UnitID")); + + b.Property("BedRoom") + .HasColumnType("int"); + + b.Property("FlolorNu") + .HasColumnType("int"); + + b.Property("HomeId") + .HasColumnType("int"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Rent") + .HasColumnType("int"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("WashRoom") + .HasColumnType("int"); + + b.Property("unitName") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UnitID"); + + b.HasIndex("HomeId"); + + b.HasIndex("OwnerId"); + + b.HasIndex("StatusId"); + + b.ToTable("Units"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.User", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("UserId")); + + b.Property("Address") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Email") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Phone") + .IsRequired() + .HasMaxLength(11) + .HasColumnType("nvarchar(11)"); + + b.Property("RoleID") + .HasColumnType("int"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("Username") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId"); + + b.HasIndex("RoleID"); + + b.HasIndex("StatusId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.BillGenerate", b => + { + b.HasOne("HomeRentManagement.Data.Status", "Status") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Tenant", "Tenant") + .WithMany() + .HasForeignKey("TenantID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Status"); + + b.Navigation("Tenant"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Floor", b => + { + b.HasOne("HomeRentManagement.Data.House", "House") + .WithMany() + .HasForeignKey("HouseID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("House"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.House", b => + { + b.HasOne("HomeRentManagement.Data.User", "Owner") + .WithMany("Houses") + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Status", "Status") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("Status"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Payment", b => + { + b.HasOne("HomeRentManagement.Data.Tenant", "Tenant") + .WithMany() + .HasForeignKey("TenantID") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Unit", "Unit") + .WithMany() + .HasForeignKey("UnitID") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Tenant"); + + b.Navigation("Unit"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Rental", b => + { + b.HasOne("HomeRentManagement.Data.Tenant", "Tenant") + .WithMany() + .HasForeignKey("TenantID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Tenant"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Role", b => + { + b.HasOne("HomeRentManagement.Data.Status", "statuss") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("statuss"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Tenant", b => + { + b.HasOne("HomeRentManagement.Data.House", "House") + .WithMany() + .HasForeignKey("HomeId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Status", "Status") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Unit", "Unit") + .WithMany("Tenants") + .HasForeignKey("UnitID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("House"); + + b.Navigation("Owner"); + + b.Navigation("Status"); + + b.Navigation("Unit"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Unit", b => + { + b.HasOne("HomeRentManagement.Data.House", "House") + .WithMany() + .HasForeignKey("HomeId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Status", "Status") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("House"); + + b.Navigation("Owner"); + + b.Navigation("Status"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.User", b => + { + b.HasOne("HomeRentManagement.Data.Role", "Role") + .WithMany() + .HasForeignKey("RoleID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Status", "Status") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("Status"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Unit", b => + { + b.Navigation("Tenants"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.User", b => + { + b.Navigation("Houses"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/HomeRentManagement/Migrations/20240528132650_payment-month.cs b/HomeRentManagement/Migrations/20240528132650_payment-month.cs new file mode 100644 index 0000000..7bba67a --- /dev/null +++ b/HomeRentManagement/Migrations/20240528132650_payment-month.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace HomeRentManagement.Migrations +{ + /// + public partial class paymentmonth : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "PaymentMonth", + table: "Payments", + type: "nvarchar(max)", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "PaymentMonth", + table: "Payments"); + } + } +} diff --git a/HomeRentManagement/Migrations/20240528132912_payment-monthd.Designer.cs b/HomeRentManagement/Migrations/20240528132912_payment-monthd.Designer.cs new file mode 100644 index 0000000..3d5eb26 --- /dev/null +++ b/HomeRentManagement/Migrations/20240528132912_payment-monthd.Designer.cs @@ -0,0 +1,536 @@ +// +using System; +using HomeRentManagement.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace HomeRentManagement.Migrations +{ + [DbContext(typeof(addDbContex))] + [Migration("20240528132912_payment-monthd")] + partial class paymentmonthd + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.5") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("HomeRentManagement.Data.BillGenerate", b => + { + b.Property("BillingID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("BillingID")); + + b.Property("ElectricityBill") + .HasColumnType("decimal(18,2)"); + + b.Property("GasBill") + .HasColumnType("decimal(18,2)"); + + b.Property("MonthName") + .HasColumnType("nvarchar(max)"); + + b.Property("ServiceCharge") + .HasColumnType("decimal(18,2)"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("TenantID") + .HasColumnType("int"); + + b.Property("TotalRent") + .HasColumnType("decimal(18,2)"); + + b.HasKey("BillingID"); + + b.HasIndex("StatusId"); + + b.HasIndex("TenantID"); + + b.ToTable("BillGenerates"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Floor", b => + { + b.Property("FloorID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("FloorID")); + + b.Property("FloorNumber") + .HasColumnType("int"); + + b.Property("HouseID") + .HasColumnType("int"); + + b.HasKey("FloorID"); + + b.HasIndex("HouseID"); + + b.ToTable("Floors"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.House", b => + { + b.Property("HouseID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("HouseID")); + + b.Property("HouseAddress") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("HouseName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("floorNumber") + .HasColumnType("int"); + + b.HasKey("HouseID"); + + b.HasIndex("OwnerId"); + + b.HasIndex("StatusId"); + + b.ToTable("Houses"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Payment", b => + { + b.Property("PaymentID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("PaymentID")); + + b.Property("PaymentMonth") + .HasColumnType("nvarchar(max)"); + + b.Property("TenantID") + .HasColumnType("int"); + + b.Property("UnitID") + .HasColumnType("int"); + + b.HasKey("PaymentID"); + + b.HasIndex("TenantID"); + + b.HasIndex("UnitID"); + + b.ToTable("Payments"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Rental", b => + { + b.Property("RentID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("RentID")); + + b.Property("RentDate") + .HasColumnType("datetime2"); + + b.Property("RentMont") + .HasColumnType("nvarchar(max)"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("TenantID") + .HasColumnType("int"); + + b.Property("totalRent") + .HasColumnType("decimal(18,2)"); + + b.HasKey("RentID"); + + b.HasIndex("TenantID"); + + b.ToTable("Rentals"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ShortForm") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("Title") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("StatusId"); + + b.ToTable("Roles"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Status", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ShorForm") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Statuss"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Tenant", b => + { + b.Property("TenantID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("TenantID")); + + b.Property("HomeId") + .HasColumnType("int"); + + b.Property("IdCardNumber") + .HasColumnType("nvarchar(max)"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("PhoneNumber") + .HasColumnType("nvarchar(max)"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("TenantName") + .HasColumnType("nvarchar(max)"); + + b.Property("UnitID") + .HasColumnType("int"); + + b.HasKey("TenantID"); + + b.HasIndex("HomeId"); + + b.HasIndex("OwnerId"); + + b.HasIndex("StatusId"); + + b.HasIndex("UnitID"); + + b.ToTable("Tenants"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Unit", b => + { + b.Property("UnitID") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("UnitID")); + + b.Property("BedRoom") + .HasColumnType("int"); + + b.Property("FlolorNu") + .HasColumnType("int"); + + b.Property("HomeId") + .HasColumnType("int"); + + b.Property("OwnerId") + .HasColumnType("int"); + + b.Property("Rent") + .HasColumnType("int"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("WashRoom") + .HasColumnType("int"); + + b.Property("unitName") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UnitID"); + + b.HasIndex("HomeId"); + + b.HasIndex("OwnerId"); + + b.HasIndex("StatusId"); + + b.ToTable("Units"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.User", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("UserId")); + + b.Property("Address") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Email") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Phone") + .IsRequired() + .HasMaxLength(11) + .HasColumnType("nvarchar(11)"); + + b.Property("RoleID") + .HasColumnType("int"); + + b.Property("StatusId") + .HasColumnType("int"); + + b.Property("Username") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId"); + + b.HasIndex("RoleID"); + + b.HasIndex("StatusId"); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.BillGenerate", b => + { + b.HasOne("HomeRentManagement.Data.Status", "Status") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Tenant", "Tenant") + .WithMany() + .HasForeignKey("TenantID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Status"); + + b.Navigation("Tenant"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Floor", b => + { + b.HasOne("HomeRentManagement.Data.House", "House") + .WithMany() + .HasForeignKey("HouseID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("House"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.House", b => + { + b.HasOne("HomeRentManagement.Data.User", "Owner") + .WithMany("Houses") + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Status", "Status") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Owner"); + + b.Navigation("Status"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Payment", b => + { + b.HasOne("HomeRentManagement.Data.Tenant", "Tenant") + .WithMany() + .HasForeignKey("TenantID") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Unit", "Unit") + .WithMany() + .HasForeignKey("UnitID") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Tenant"); + + b.Navigation("Unit"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Rental", b => + { + b.HasOne("HomeRentManagement.Data.Tenant", "Tenant") + .WithMany() + .HasForeignKey("TenantID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Tenant"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Role", b => + { + b.HasOne("HomeRentManagement.Data.Status", "statuss") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("statuss"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Tenant", b => + { + b.HasOne("HomeRentManagement.Data.House", "House") + .WithMany() + .HasForeignKey("HomeId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Status", "Status") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Unit", "Unit") + .WithMany("Tenants") + .HasForeignKey("UnitID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("House"); + + b.Navigation("Owner"); + + b.Navigation("Status"); + + b.Navigation("Unit"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Unit", b => + { + b.HasOne("HomeRentManagement.Data.House", "House") + .WithMany() + .HasForeignKey("HomeId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.User", "Owner") + .WithMany() + .HasForeignKey("OwnerId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Status", "Status") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("House"); + + b.Navigation("Owner"); + + b.Navigation("Status"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.User", b => + { + b.HasOne("HomeRentManagement.Data.Role", "Role") + .WithMany() + .HasForeignKey("RoleID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HomeRentManagement.Data.Status", "Status") + .WithMany() + .HasForeignKey("StatusId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("Status"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.Unit", b => + { + b.Navigation("Tenants"); + }); + + modelBuilder.Entity("HomeRentManagement.Data.User", b => + { + b.Navigation("Houses"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/HomeRentManagement/Migrations/20240528132912_payment-monthd.cs b/HomeRentManagement/Migrations/20240528132912_payment-monthd.cs new file mode 100644 index 0000000..5f3c2f5 --- /dev/null +++ b/HomeRentManagement/Migrations/20240528132912_payment-monthd.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace HomeRentManagement.Migrations +{ + /// + public partial class paymentmonthd : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "RentMont", + table: "Rentals", + type: "nvarchar(max)", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "RentMont", + table: "Rentals"); + } + } +} diff --git a/HomeRentManagement/Migrations/addDbContexModelSnapshot.cs b/HomeRentManagement/Migrations/addDbContexModelSnapshot.cs index 5d26c55..b4010b7 100644 --- a/HomeRentManagement/Migrations/addDbContexModelSnapshot.cs +++ b/HomeRentManagement/Migrations/addDbContexModelSnapshot.cs @@ -123,6 +123,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("PaymentID")); + b.Property("PaymentMonth") + .HasColumnType("nvarchar(max)"); + b.Property("TenantID") .HasColumnType("int"); @@ -149,6 +152,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("RentDate") .HasColumnType("datetime2"); + b.Property("RentMont") + .HasColumnType("nvarchar(max)"); + b.Property("StatusId") .HasColumnType("int"); diff --git a/HomeRentManagement/Pages/PaymentDetails.razor b/HomeRentManagement/Pages/PaymentDetails.razor index 1a55433..5eea482 100644 --- a/HomeRentManagement/Pages/PaymentDetails.razor +++ b/HomeRentManagement/Pages/PaymentDetails.razor @@ -20,7 +20,10 @@ Unit Name Total Paid - + Rent Date + + Rent Month + Paid Status Action @@ -41,6 +44,10 @@ @re.Tenant?.Unit.unitName @re.totalRent + @re.RentDate + + @re.RentMont + @{ bool paid = false; } @@ -113,7 +120,10 @@ - +
+ + +
@@ -152,6 +162,10 @@
+
+ + +
@@ -287,6 +301,7 @@ else TenantID=billMember.TenantID, totalRent = billMember.totalRent, RentDate=billMember.RentDate, + RentMont=billMember.RentMont };