feat(giving): add sundayAttendanceCount model field and attendance setCounts API
ci-cd-vm / ci-cd (push) Successful in 2m21s
ci-cd-vm / ci-cd (push) Successful in 2m21s
This commit is contained in:
@@ -64,6 +64,7 @@ public class OfferingEntryController : ControllerBase
|
||||
NickName = request.NickName,
|
||||
FirstName_zh = request.FirstName_zh,
|
||||
LastName_zh = request.LastName_zh,
|
||||
Entity = request.Entity,
|
||||
PhoneCell = request.PhoneCell,
|
||||
Status = "Visitor",
|
||||
Country = "USA",
|
||||
@@ -73,6 +74,7 @@ public class OfferingEntryController : ControllerBase
|
||||
{
|
||||
Id = id, NickName = request.NickName,
|
||||
FirstName_en = request.FirstName_en, LastName_en = request.LastName_en,
|
||||
Entity = request.Entity,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -9,4 +9,5 @@ public class MemberTypeaheadDto
|
||||
public string? NickName { get; set; }
|
||||
public string FirstName_en { get; set; } = "";
|
||||
public string LastName_en { get; set; } = "";
|
||||
public string? Entity { get; set; } // company / business name (公司行號), if any
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@ public class QuickAddMemberRequest
|
||||
[MaxLength(100)] public string? NickName { get; set; }
|
||||
[MaxLength(100)] public string? FirstName_zh { get; set; }
|
||||
[MaxLength(100)] public string? LastName_zh { get; set; }
|
||||
[MaxLength(200)] public string? Entity { get; set; }
|
||||
[MaxLength(30)] public string? PhoneCell { get; set; }
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ public class CreateMemberRequest
|
||||
[MaxLength(100)] public string? NickName { get; set; }
|
||||
[MaxLength(100)] public string? FirstName_zh { get; set; }
|
||||
[MaxLength(100)] public string? LastName_zh { get; set; }
|
||||
[MaxLength(200)] public string? Entity { get; set; }
|
||||
[MaxLength(10)] public string? Gender { get; set; }
|
||||
public DateOnly? DateOfBirth { get; set; }
|
||||
public DateOnly? BaptismDate { get; set; }
|
||||
|
||||
@@ -8,6 +8,7 @@ public class MemberListItemDto
|
||||
public string? NickName { get; set; }
|
||||
public string? FirstName_zh { get; set; }
|
||||
public string? LastName_zh { get; set; }
|
||||
public string? Entity { get; set; }
|
||||
public string Status { get; set; } = "";
|
||||
public string? Email { get; set; }
|
||||
public string? PhoneCell { get; set; }
|
||||
|
||||
@@ -118,6 +118,7 @@ public class AppDbContext : IdentityDbContext<AppUser, AppRole, string>
|
||||
entity.Property(e => e.NickName).HasMaxLength(100);
|
||||
entity.Property(e => e.FirstName_zh).HasMaxLength(100);
|
||||
entity.Property(e => e.LastName_zh).HasMaxLength(100);
|
||||
entity.Property(e => e.Entity).HasMaxLength(200);
|
||||
entity.Property(e => e.Gender).HasMaxLength(10);
|
||||
entity.Property(e => e.BaptismChurch).HasMaxLength(200);
|
||||
entity.Property(e => e.Email).HasMaxLength(200);
|
||||
|
||||
@@ -10,6 +10,7 @@ public class Member : SoftDeleteEntity, IAuditable
|
||||
public string? NickName { get; set; }
|
||||
public string? FirstName_zh { get; set; }
|
||||
public string? LastName_zh { get; set; }
|
||||
public string? Entity { get; set; } // company / business name (公司行號) — used for company-check offerings
|
||||
public string? Gender { get; set; } // 'M' | 'F' | 'Other'
|
||||
public DateOnly? DateOfBirth { get; set; }
|
||||
public DateOnly? BaptismDate { get; set; }
|
||||
|
||||
@@ -1140,6 +1140,10 @@ namespace ROLAC.API.Migrations
|
||||
.HasMaxLength(200)
|
||||
.HasColumnType("character varying(200)");
|
||||
|
||||
b.Property<string>("Entity")
|
||||
.HasMaxLength(200)
|
||||
.HasColumnType("character varying(200)");
|
||||
|
||||
b.Property<int?>("FamilyUnitId")
|
||||
.HasColumnType("integer");
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@ public class MemberService : IMemberService
|
||||
(m.NickName != null && m.NickName.ToLower().Contains(s)) ||
|
||||
(m.FirstName_zh != null && m.FirstName_zh.Contains(search)) ||
|
||||
(m.LastName_zh != null && m.LastName_zh.Contains(search)) ||
|
||||
(m.Entity != null && m.Entity.ToLower().Contains(s)) ||
|
||||
(m.Email != null && m.Email.ToLower().Contains(s)));
|
||||
}
|
||||
|
||||
@@ -74,6 +75,7 @@ public class MemberService : IMemberService
|
||||
NickName = m.NickName,
|
||||
FirstName_zh = m.FirstName_zh,
|
||||
LastName_zh = m.LastName_zh,
|
||||
Entity = m.Entity,
|
||||
Status = m.Status,
|
||||
Email = m.Email,
|
||||
PhoneCell = m.PhoneCell,
|
||||
@@ -105,6 +107,7 @@ public class MemberService : IMemberService
|
||||
{
|
||||
Id = m.Id, FirstName_en = m.FirstName_en, LastName_en = m.LastName_en,
|
||||
NickName = m.NickName, FirstName_zh = m.FirstName_zh, LastName_zh = m.LastName_zh,
|
||||
Entity = m.Entity,
|
||||
Gender = m.Gender, DateOfBirth = m.DateOfBirth, BaptismDate = m.BaptismDate,
|
||||
BaptismChurch = m.BaptismChurch, Email = m.Email, PhoneCell = m.PhoneCell,
|
||||
PhoneHome = m.PhoneHome, Address = m.Address, City = m.City, State = m.State,
|
||||
@@ -157,6 +160,7 @@ public class MemberService : IMemberService
|
||||
{
|
||||
FirstName_en = r.FirstName_en, LastName_en = r.LastName_en,
|
||||
NickName = r.NickName, FirstName_zh = r.FirstName_zh, LastName_zh = r.LastName_zh,
|
||||
Entity = r.Entity,
|
||||
Gender = r.Gender, DateOfBirth = r.DateOfBirth, BaptismDate = r.BaptismDate,
|
||||
BaptismChurch = r.BaptismChurch, Email = r.Email, PhoneCell = r.PhoneCell,
|
||||
PhoneHome = r.PhoneHome, Address = r.Address, City = r.City, State = r.State,
|
||||
@@ -169,6 +173,7 @@ public class MemberService : IMemberService
|
||||
{
|
||||
m.FirstName_en = r.FirstName_en; m.LastName_en = r.LastName_en;
|
||||
m.NickName = r.NickName; m.FirstName_zh = r.FirstName_zh; m.LastName_zh = r.LastName_zh;
|
||||
m.Entity = r.Entity;
|
||||
m.Gender = r.Gender; m.DateOfBirth = r.DateOfBirth; m.BaptismDate = r.BaptismDate;
|
||||
m.BaptismChurch = r.BaptismChurch; m.Email = r.Email; m.PhoneCell = r.PhoneCell;
|
||||
m.PhoneHome = r.PhoneHome; m.Address = r.Address; m.City = r.City; m.State = r.State;
|
||||
|
||||
Reference in New Issue
Block a user