authlinq-dot-net
/
societyapp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added CollectorListName nvarchar(500) Checked 

SerialNumberofCL	nvarchar(500)	Checked
CollectorStatus	nvarchar(500)	Checked
CollectorApprovalDate	nvarchar(500)	Checked for resale
6 hours
This commit is contained in:
giteasujitb 2025-03-15 23:19:42 +05:30
parent cea00f7818
commit 9fc9fd3f47
7 changed files with 137 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
coderush/Controllers/FlatListController.cs
View File

@ -540,6 +540,11 @@ namespace SocietyCA.Controllers
editedResaleItem.CoOwnerCast = resaleFlatInformation.CoOwnerCast;
editedResaleItem.CoOwnerDateOfBirth = resaleFlatInformation.CoOwnerDateOfBirth;
editedResaleItem.SerialNumberofCl = resaleFlatInformation.SerialNumberofCl;
editedResaleItem.CollectorStatus = resaleFlatInformation.CollectorStatus;
editedResaleItem.CollectorApprovalDate = resaleFlatInformation.CollectorApprovalDate;
editedResaleItem.CollectorListName = resaleFlatInformation.CollectorListName;
_context.Update(editedResaleItem);
_context.SaveChanges();

4
coderush/Controllers/PDFController.cs
View File

@ -666,7 +666,7 @@ namespace SocietyCA.Controllers
{
OriginalMemberName = String.Format("{0} {1} {2}", resellItem.FirstName,
resellItem.MiddleName, resellItem.LastName),
MemberClass = $"Member | Resale Owner {i}",
MemberClass = $"Member | Resale Owner {i} | {resellItem.CollectorStatus}",
Address = $"{fincalInfo.Building}-{fincalInfo.FlatNo}, DCHS, Dhanakwadi, Pune-411043",
CssClassName = resaleEntries.Count() != i ? "strikeout" : string.Empty
};
@ -1989,7 +1989,7 @@ namespace SocietyCA.Controllers
&& indexArray[i].HasValue
? indexArray[i].Value.ToString("dd-MM-yyyy") : "";
resellInfo.CessationReason = resaleItem.ResaleType;
resellInfo.Remarks = "";
resellInfo.Remarks = resaleItem.CollectorStatus ?? "";
resellInfo.CssClassName = resaleEntries.Count() != i ? "strikeout" : string.Empty;
var nomineeSets = _context.NomineeAllocation

17
coderush/Controllers/ReportsController.cs
View File

@ -961,9 +961,15 @@ namespace SocietyCA.Controllers
{
var resaleEntry = _context.ResaleFlats.Where(x => x.FlatNo.Equals(item.FlatNo)
&& x.BuildingNumber.Trim().Equals(item.Building.Trim())).OrderByDescending(p => p.IndexIidate).FirstOrDefault();
generalMeetingReport.CurrentMemberName = textInfo.ToTitleCase((string.Format("{0} {1} {2}",
resaleEntry?.FirstName?.Trim() ?? "", resaleEntry?.MiddleName?.Trim() ?? "", resaleEntry?.LastName?.Trim() ?? "")).ToLower());
if (!string.IsNullOrEmpty(resaleEntry.CollectorStatus))
{
generalMeetingReport.CollectorApprovalStatus = resaleEntry.CollectorStatus;
}
voterLists.Add(generalMeetingReport);
}
@ -1043,6 +1049,11 @@ namespace SocietyCA.Controllers
generalMeetingReport.CurrentMemberName = textInfo.ToTitleCase((string.Format("{0} {1} {2}",
resaleEntry?.FirstName?.Trim() ?? "", resaleEntry?.MiddleName?.Trim() ?? "", resaleEntry?.LastName?.Trim() ?? "")).ToLower());
if (!string.IsNullOrEmpty(resaleEntry.CollectorStatus))
{
generalMeetingReport.CollectorApprovalStatus = resaleEntry.CollectorStatus;
}
meetingReports.Add(generalMeetingReport);
}
@ -1159,19 +1170,19 @@ namespace SocietyCA.Controllers
reportModel.Building = item.Building;
reportModel.FlatNo = item.FlatNo;
reportModel.TypeOfPayment = item.TypeOfPayment;
reportModel.AmountReceived = Math.Round(item.AmountReceived.Value,0);
reportModel.AmountReceived = Math.Round(item.AmountReceived.Value, 0);
reportModel.CreatedDate = item.CreatedDate;
var fincaldata = _context.FinancialData.Where(x => x.FlatNo.Equals(item.FlatNo)
&& x.Building.Trim().Equals(item.Building.Trim())).FirstOrDefault();
reportModel.TotalAmount = Math.Round(fincaldata.TotalAmount.Value,0);
reportModel.TotalAmount = Math.Round(fincaldata.TotalAmount.Value, 0);
var totalReceivedAmount = _context.AmountCollection.Where(x => x.FlatNo.Equals(item.FlatNo)
&& x.Building.Trim().Equals(item.Building.Trim())).Sum(p => p.AmountReceived);
reportModel.TotalAmountReceived = Math.Round(totalReceivedAmount.Value, 0);
reportModel.RemainingAmount = Math.Round(reportModel.TotalAmount.Value - totalReceivedAmount.Value,0);
reportModel.RemainingAmount = Math.Round(reportModel.TotalAmount.Value - totalReceivedAmount.Value, 0);
if (Math.Round(reportModel.RemainingAmount.Value, 0) <= 0)
{

12
coderush/NewModels/ResaleFlats.cs
View File

@ -167,5 +167,17 @@ namespace SocietyCA.NewModels
[Display(Name = "M.Last Name")]
public string MLastName { get; set; }
[Display(Name = "Collector List Names")]
public string CollectorListName { get; set; }
[Display(Name = "Serial No. of list")]
public string SerialNumberofCl { get; set; }
[Display(Name = "Collector Status")]
public string CollectorStatus { get; set; }
[Display(Name = "Approval Date")]
public string CollectorApprovalDate { get; set; }
}
}

20
coderush/NewModels/SocietyCollectorApprovalsTESTContext.cs
View File

@ -425,9 +425,15 @@ namespace SocietyCA.NewModels
.HasColumnName("SCIssueDate")
.HasColumnType("date");
entity.Property(e => e.CollectorListName).HasMaxLength(500);
entity.Property(e => e.SerialNumberofCl)
.HasColumnName("SerialNumberofCL")
.HasMaxLength(500);
.HasColumnName("SerialNumberofCL")
.HasMaxLength(500);
entity.Property(e => e.CollectorStatus).HasMaxLength(500);
entity.Property(e => e.CollectorApprovalDate).HasMaxLength(500);
entity.Property(e => e.ShareCertificateNo).HasMaxLength(500);
@ -991,6 +997,16 @@ namespace SocietyCA.NewModels
entity.Property(e => e.TransferFeeRecivedAmt)
.HasMaxLength(50)
.IsUnicode(false);
entity.Property(e => e.CollectorListName).HasMaxLength(500);
entity.Property(e => e.SerialNumberofCl)
.HasColumnName("SerialNumberofCL")
.HasMaxLength(500);
entity.Property(e => e.CollectorStatus).HasMaxLength(500);
entity.Property(e => e.CollectorApprovalDate).HasMaxLength(500);
});
modelBuilder.Entity<Rrdata>(entity =>

88
coderush/Views/FlatList/Form.cshtml
View File

@ -811,7 +811,7 @@
<section>
<div class="modal fade" id="resaleModel" role="dialog">
<div class="modal-dialog modal-lg">
<div class="modal-dialog" style="min-width:1140px;">
<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
@ -819,7 +819,7 @@
<h4 class="modal-title">Resale Type Information</h4>
<label id="lbl-resale-type" asp-for="@Model.ResaleInformation.ResaleType" style="display:none;"></label>
</div>
<div class="modal-body">
<div class="modal-body" style=" max-height: calc(100vh - 200px); overflow-y: auto;">
<div class="box-body">
<input type="hidden" id="resale-id" asp-for="@Model.ResaleInformation.ResaleId" />
<div class="row">
@ -1010,6 +1010,61 @@
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label asp-for="@Model.ResaleInformation.CollectorListName"></label>
<select asp-for="@Model.ResaleInformation.CollectorListName" id="r-collectorListId" class="form-control">
<option value="">NA</option>
<option value="Approved List - I">Approved List - I</option>
<option value="Approved List - II">Approved List - II</option>
<option value="Approved List - III">Approved List - III</option>
<option value="Approved List - IV">Approved List - IV</option>
<option value="Approved List - V">Approved List - V</option>
<option value="Duplicate Name">Duplicate Name</option>
<option value="Under PMC">Under PMC</option>
</select>
<span asp-validation-for="@Model.ResaleInformation.CollectorListName" class="text-danger"></span>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label asp-for="@Model.ResaleInformation.SerialNumberofCl"></label>
<input asp-for="@Model.ResaleInformation.SerialNumberofCl" class="form-control" id="r-SerialNumberofCl" />
<span asp-validation-for="@Model.ResaleInformation.SerialNumberofCl" class="text-danger"></span>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label asp-for="@Model.ResaleInformation.CollectorStatus"></label>
<select asp-for="@Model.ResaleInformation.CollectorStatus" class="form-control" id="r-CollectorStatus">
<option value="">NA</option>
<option value="Collector Approved">Collector Approved</option>
<option value="Collector Declined">Collector Declined</option>
<option value="Not Sure">Not Sure</option>
</select>
<span asp-validation-for="@Model.ResaleInformation.CollectorStatus" class="text-danger"></span>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label asp-for="@Model.ResaleInformation.CollectorApprovalDate"></label>
<select asp-for="@Model.ResaleInformation.CollectorApprovalDate" id="r-CollectorApprovalDateID"
class="form-control">
<option value="">NA</option>
<option value="30/01/1960">30 JAN 1960</option>
<option value="04/04/2008">04 APR 2008</option>
<option value="07/06/2008">07 JUN 2008</option>
<option value="12/06/2007">12 JUN 2007</option>
<option value="05/09/2024">05 SEPT 2024</option>
</select>
<span asp-validation-for="@Model.ResaleInformation.CollectorApprovalDate" class="text-danger"></span>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
@ -1361,12 +1416,12 @@
<!-- /.content -->
</div>
<!-- /.content-wrapper -->
@section Styles{
@section Styles {
}
@section Scripts{
@section Scripts {
<partial name="_ValidationScriptsPartial" />
@ -1391,6 +1446,25 @@
});
$("#r-collectorListId").change(function () {
var value = $('#r-collectorListId :selected').text();
if (value == 'Approved List - I') {
$('#r-CollectorApprovalDateID').val('04/04/2008');
} else if (value == 'Approved List - II') {
$('#r-CollectorApprovalDateID').val('07/06/2008');
} else if (value == 'Approved List - III') {
$('#r-CollectorApprovalDateID').val('12/06/2007');
} else if (value == 'Approved List - IV') {
$('#r-CollectorApprovalDateID').val('30/01/1960');
} else if (value == 'Approved List - V') {
$('#r-CollectorApprovalDateID').val('05/09/2024');
} else {
$('#r-CollectorApprovalDateID').val('');
}
});
$('#OwnershipStatus').change(function () {
var selectedOwnershipStatus = $('#OwnershipStatus').val();
if (selectedOwnershipStatus == 'Gift Deed' ||
@ -1537,6 +1611,12 @@
$("#r-co-cast").val(isNullOrEmpty(data.coOwnerCast) ? '' : data.coOwnerCast.trim());
$("#r-co-birthdate").val(isNullOrEmpty(data.coOwnerDateOfBirth) ? '' : moment(data.coOwnerDateOfBirth).format('YYYY-MM-DD'));
$("#r-SerialNumberofCl").val(isNullOrEmpty(data.serialNumberofCl) ? '' : data.serialNumberofCl.trim());
$("#r-CollectorStatus").val(isNullOrEmpty(data.collectorStatus) ? '' : data.collectorStatus.trim());
$("#r-CollectorApprovalDateID").val(isNullOrEmpty(data.collectorApprovalDate) ? '' : data.collectorApprovalDate.trim());
$("#r-collectorListId").val(isNullOrEmpty(data.collectorListName) ? '' : data.collectorListName.trim());
$('#resaleModel').modal(options);
$('#resaleModel').modal('show');

3
coderush/Views/Shared/_Adminlte.cshtml
View File

@ -90,7 +90,8 @@
<script src="~/adminlte/plugins/iCheck/icheck.min.js"></script>
<!-- Toastr -->
<script src="~/adminlte/plugins/toastr/toastr.min.js"></script>
<script src="https://unpkg.com/sweetalert/dist/sweetalert.min.js"></script>
@* <script src="https://unpkg.com/sweetalert/dist/sweetalert.min.js"></script> *@
<script src="~/js/sweetalert.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.4/moment.min.js"></script>
<!-- AdminLTE App -->
<script src="~/adminlte/dist/js/adminlte.min.js"></script>