adam/shoc-backend
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/shoc-backend.git synced 2026-10-02 07:23:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Contacts.Name references throughout Blazor project

Browse source 
- Replace all Contacts.Name with (FirstName + " " + LastName) pattern
- Fix ContactService, Index.razor, QuotesPDF, QuotesDetails, CreateQuotes
- Fix WorkOrderPDF, Viewworkorder, UserViewWordOrder, Addworkorders
- Fix ViewTemplate, AddTemplate, Templates settings pages
- Blazor project now builds successfully
This commit is contained in:
Adam Moussa 2026-04-16 16:54:28 -04:00
parent 493cff00fb
commit dbb31ca7d7
12 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SeaHavenIndustries/Components/Pages/Contact/Index.razor
View file

@ -57,9 +57,15 @@
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<label for="exampleFormControlInput1" class="form-label">Name:</label> <label for="exampleFormControlInput1" class="form-label">First Name:</label>
<div class="input-group input-group-outline mt-1 mb-2"> <div class="input-group input-group-outline mt-1 mb-2">
<input type="text" class="form-control" @bind="contacts.Name" /> <input type="text" class="form-control" @bind="contacts.FirstName" />
</div>
</div>
<div class="col-12">
<label for="exampleFormControlInput1" class="form-label">Last Name:</label>
<div class="input-group input-group-outline mt-1 mb-2">
<input type="text" class="form-control" @bind="contacts.LastName" />
</div> </div>
</div> </div>
<div class="col-12"> <div class="col-12">

2
SeaHavenIndustries/Components/Pages/Quotes/CreateQuotes.razor
View file

@ -238,7 +238,7 @@
var query = contactslist; var query = contactslist;
if (!string.IsNullOrEmpty(args.Filter)) if (!string.IsNullOrEmpty(args.Filter))
{ {
query = query.Where(c => c.Name.ToLower().Contains(args.Filter.ToLower())); query = query.Where(c => (c.FirstName + " " + c.LastName).ToLower().Contains(args.Filter.ToLower()));
} }
if (query != null) if (query != null)
{ {

2
SeaHavenIndustries/Components/Pages/Quotes/QuotesDetails.razor
View file

@ -55,7 +55,7 @@
<p class="w-50 mb-0">POC :</p> <p class="w-50 mb-0">POC :</p>
@if (model.Contacts != null) @if (model.Contacts != null)
{ {
<p class="w-40 mb-0">@model.Contacts.Name</p> <p class="w-40 mb-0">@(model.Contacts.FirstName + " " + model.Contacts.LastName)</p>
} }
</div> </div>
</div> </div>

2
SeaHavenIndustries/Components/Pages/Quotes/QuotesPDF.razor
View file

@ -62,7 +62,7 @@
<p class="w-50 mb-0"> <p class="w-50 mb-0">
POC : @if (model.Contacts != null) POC : @if (model.Contacts != null)
{ {
<span class="w-50 mb-0" style="margin-left:15px">@model.Contacts.Name.</span> <span class="w-50 mb-0" style="margin-left:15px">@(model.Contacts.FirstName + " " + model.Contacts.LastName)</span>
} }
</p> </p>

2
SeaHavenIndustries/Components/Pages/Setting/AddTemplate.razor
View file

@ -257,7 +257,7 @@
var query = contactslist; var query = contactslist;
if (!string.IsNullOrEmpty(args.Filter)) if (!string.IsNullOrEmpty(args.Filter))
{ {
query = query.Where(c => c.Name.ToLower().Contains(args.Filter.ToLower())); query = query.Where(c => (c.FirstName + " " + c.LastName).ToLower().Contains(args.Filter.ToLower()));
} }
if (query != null) if (query != null)
{ {

2
SeaHavenIndustries/Components/Pages/Setting/Templates.razor
View file

@ -152,7 +152,7 @@ else if (step == 2)
var query = contactslist; var query = contactslist;
if (!string.IsNullOrEmpty(args.Filter)) if (!string.IsNullOrEmpty(args.Filter))
{ {
query = query.Where(c => c.Name.ToLower().Contains(args.Filter.ToLower())); query = query.Where(c => (c.FirstName + " " + c.LastName).ToLower().Contains(args.Filter.ToLower()));
} }
if (query != null) if (query != null)
{ {

4
SeaHavenIndustries/Components/Pages/Setting/ViewTemplate.razor
View file

@ -41,7 +41,7 @@
{ {
foreach (var itm in model.WorkOrderContacts) foreach (var itm in model.WorkOrderContacts)
{ {
<span class="badge badge-info me-2">@itm.POC?.Name</span> <span class="badge badge-info me-2">@((itm.POC?.FirstName + " " + itm.POC?.LastName).Trim())</span>
} }
} }
@ -227,7 +227,7 @@
var query = contactslist; var query = contactslist;
if (!string.IsNullOrEmpty(args.Filter)) if (!string.IsNullOrEmpty(args.Filter))
{ {
query = query.Where(c => c.Name.ToLower().Contains(args.Filter.ToLower())); query = query.Where(c => (c.FirstName + " " + c.LastName).ToLower().Contains(args.Filter.ToLower()));
} }
if (query != null) if (query != null)
{ {

3
SeaHavenIndustries/Components/Pages/Workorder/Addworkorders.razor
View file

@ -387,8 +387,7 @@
var query = contactslist; var query = contactslist;
if (!string.IsNullOrEmpty(args.Filter)) if (!string.IsNullOrEmpty(args.Filter))
{ {
query = query.Where(c => c.Name != null && query = query.Where(c => (c.FirstName + " " + c.LastName).ToLower().Contains(args.Filter.ToLower()));
c.Name.ToLower().Contains(args.Filter.ToLower()));
} }
if (query != null) if (query != null)
{ {

2
SeaHavenIndustries/Components/Pages/Workorder/UserViewWordOrder.razor
View file

@ -131,7 +131,7 @@ else
{ {
foreach (var itm in order.WorkOrderContacts) foreach (var itm in order.WorkOrderContacts)
{ {
<span class="badge badge-info me-2">@itm.POC.Name</span> <span class="badge badge-info me-2">@((itm.POC.FirstName + " " + itm.POC.LastName).Trim())</span>
} }
} }
</div> </div>

2
SeaHavenIndustries/Components/Pages/Workorder/Viewworkorder.razor
View file

@ -139,7 +139,7 @@ else
{ {
foreach (var itm in order.WorkOrderContacts) foreach (var itm in order.WorkOrderContacts)
{ {
<span class="badge badge-info me-2">@itm.POC.Name</span> <span class="badge badge-info me-2">@((itm.POC.FirstName + " " + itm.POC.LastName).Trim())</span>
} }
} }
</div> </div>

2
SeaHavenIndustries/Components/Pages/Workorder/WorkOrderPDF.razor
View file

@ -121,7 +121,7 @@
<div class="row"> <div class="row">
<div class=""> <div class="">
<p class="mb-1" style="color: white !important;">POC: <span style="margin-left:15px">@itm.POC.Name</span></p> <p class="mb-1" style="color: white !important;">POC: <span style="margin-left:15px">@((itm.POC.FirstName + " " + itm.POC.LastName).Trim())</span></p>
<p class="mb-1" style="color: white !important;">Email: <span style="margin-left:15px">@itm.POC.Email</span></p> <p class="mb-1" style="color: white !important;">Email: <span style="margin-left:15px">@itm.POC.Email</span></p>
<p class="mb-1" style="color: white !important;">Phone Number: <span style="margin-left:15px">@itm.POC.PhoneNumber</span></p> <p class="mb-1" style="color: white !important;">Phone Number: <span style="margin-left:15px">@itm.POC.PhoneNumber</span></p>
</div> </div>

3
SeaHavenIndustries/Data/Services/ContactService.cs
View file

@ -24,7 +24,8 @@ namespace SeaHavenIndustries.Data.Services
var exist = _context.Contacts.Where(w => w.Id == contacts.Id).FirstOrDefault(); var exist = _context.Contacts.Where(w => w.Id == contacts.Id).FirstOrDefault();
if (exist != null) if (exist != null)
{ {
exist.Name = contacts.Name; exist.FirstName = contacts.FirstName;
exist.LastName = contacts.LastName;
exist.PhoneNumber = contacts.PhoneNumber; exist.PhoneNumber = contacts.PhoneNumber;
exist.Email = contacts.Email; exist.Email = contacts.Email;
_context.Update(exist); _context.Update(exist);