Yeni tanımlar için seeder ve düzenlemeler
This commit is contained in:
parent
e9973283d9
commit
0784cb360d
11 changed files with 6127 additions and 355 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -1162,7 +1162,6 @@ public class PlatformDataSeeder : IDataSeedContributor, ITransientDependency
|
||||||
Name = item.Name,
|
Name = item.Name,
|
||||||
StartHour = item.StartHour,
|
StartHour = item.StartHour,
|
||||||
EndHour = item.EndHour,
|
EndHour = item.EndHour,
|
||||||
IsFixed = item.IsFixed,
|
|
||||||
Monday = item.Monday,
|
Monday = item.Monday,
|
||||||
Tuesday = item.Tuesday,
|
Tuesday = item.Tuesday,
|
||||||
Wednesday = item.Wednesday,
|
Wednesday = item.Wednesday,
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -343,9 +343,24 @@ public static class PlatformConsts
|
||||||
public const string Program = Default + ".Program";
|
public const string Program = Default + ".Program";
|
||||||
public const string Interesting = Default + ".Interesting";
|
public const string Interesting = Default + ".Interesting";
|
||||||
public const string SalesRejectionReason = Default + ".SalesRejectionReason";
|
public const string SalesRejectionReason = Default + ".SalesRejectionReason";
|
||||||
|
public const string ClassCancellationReason = Default + ".ClassCancellationReason";
|
||||||
public const string Source = Default + ".Source";
|
public const string Source = Default + ".Source";
|
||||||
public const string Vaccine = Default + ".Vaccine";
|
public const string Vaccine = Default + ".Vaccine";
|
||||||
public const string NoteType = Default + ".NoteType";
|
public const string NoteType = Default + ".NoteType";
|
||||||
|
public const string WorkHour = Default + ".WorkHour";
|
||||||
|
public const string Vehicle = Default + ".Vehicle";
|
||||||
|
public const string Schedule = Default + ".Schedule";
|
||||||
|
public const string ScheduleLesson = Default + ".ScheduleLesson";
|
||||||
|
public const string Psychologist = Default + ".Psychologist";
|
||||||
|
public const string Meal = Default + ".Meal";
|
||||||
|
public const string Lawyer = Default + ".Lawyer";
|
||||||
|
public const string Event = Default + ".Event";
|
||||||
|
public const string LessonPeriod = Default + ".LessonPeriod";
|
||||||
|
public const string RegistrationType = Default + ".RegistrationType";
|
||||||
|
public const string RegistrationMethod = Default + ".RegistrationMethod";
|
||||||
|
public const string ClassType = Default + ".ClassType";
|
||||||
|
public const string Class = Default + ".Class";
|
||||||
|
public const string Level = Default + ".Level";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -423,9 +438,23 @@ public static class PlatformConsts
|
||||||
public const string Program = "list-program";
|
public const string Program = "list-program";
|
||||||
public const string Interesting = "list-interesting";
|
public const string Interesting = "list-interesting";
|
||||||
public const string SalesRejectionReason = "list-salesrejectionreason";
|
public const string SalesRejectionReason = "list-salesrejectionreason";
|
||||||
|
public const string ClassCancellationReason = "list-classcancellationreason";
|
||||||
public const string Source = "list-source";
|
public const string Source = "list-source";
|
||||||
public const string Vaccine = "list-vaccine";
|
public const string Vaccine = "list-vaccine";
|
||||||
public const string NoteType = "list-notetype";
|
public const string NoteType = "list-notetype";
|
||||||
|
public const string WorkHour = "list-workhour";
|
||||||
|
public const string Vehicle = "list-vehicle";
|
||||||
|
public const string Schedule = "list-schedule";
|
||||||
|
public const string Psychologist = "list-psychologist";
|
||||||
|
public const string Meal = "list-meal";
|
||||||
|
public const string Lawyer = "list-lawyer";
|
||||||
|
public const string Event = "list-event";
|
||||||
|
public const string LessonPeriod = "list-lessonperiod";
|
||||||
|
public const string RegistrationType = "list-registrationtype";
|
||||||
|
public const string RegistrationMethod = "list-registrationmethod";
|
||||||
|
public const string ClassType = "list-classtype";
|
||||||
|
public const string Class = "list-class";
|
||||||
|
public const string Level = "list-level";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -421,9 +421,24 @@ public static class SeedConsts
|
||||||
public const string Program = Default + ".Program";
|
public const string Program = Default + ".Program";
|
||||||
public const string Interesting = Default + ".Interesting";
|
public const string Interesting = Default + ".Interesting";
|
||||||
public const string SalesRejectionReason = Default + ".SalesRejectionReason";
|
public const string SalesRejectionReason = Default + ".SalesRejectionReason";
|
||||||
|
public const string ClassCancellationReason = Default + ".ClassCancellationReason";
|
||||||
public const string Source = Default + ".Source";
|
public const string Source = Default + ".Source";
|
||||||
public const string Vaccine = Default + ".Vaccine";
|
public const string Vaccine = Default + ".Vaccine";
|
||||||
public const string NoteType = Default + ".NoteType";
|
public const string NoteType = Default + ".NoteType";
|
||||||
|
public const string WorkHour = Default + ".WorkHour";
|
||||||
|
public const string Vehicle = Default + ".Vehicle";
|
||||||
|
public const string Schedule = Default + ".Schedule";
|
||||||
|
public const string ScheduleLesson = Default + ".ScheduleLesson";
|
||||||
|
public const string Psychologist = Default + ".Psychologist";
|
||||||
|
public const string Meal = Default + ".Meal";
|
||||||
|
public const string Lawyer = Default + ".Lawyer";
|
||||||
|
public const string Event = Default + ".Event";
|
||||||
|
public const string LessonPeriod = Default + ".LessonPeriod";
|
||||||
|
public const string RegistrationType = Default + ".RegistrationType";
|
||||||
|
public const string RegistrationMethod = Default + ".RegistrationMethod";
|
||||||
|
public const string ClassType = Default + ".ClassType";
|
||||||
|
public const string Class = Default + ".Class";
|
||||||
|
public const string Level = Default + ".Level";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ public class WorkHour : FullAuditedEntity<Guid>, IMultiTenant
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public string StartHour { get; set; }
|
public string StartHour { get; set; }
|
||||||
public string EndHour { get; set; }
|
public string EndHour { get; set; }
|
||||||
public bool? IsFixed { get; set; }
|
|
||||||
|
|
||||||
public bool? Monday { get; set; }
|
public bool? Monday { get; set; }
|
||||||
public bool? Tuesday { get; set; }
|
public bool? Tuesday { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -1314,8 +1314,6 @@ public class PlatformDbContext :
|
||||||
b.Property(x => x.StartHour).HasMaxLength(8).IsRequired();
|
b.Property(x => x.StartHour).HasMaxLength(8).IsRequired();
|
||||||
b.Property(x => x.EndHour).HasMaxLength(8).IsRequired();
|
b.Property(x => x.EndHour).HasMaxLength(8).IsRequired();
|
||||||
|
|
||||||
b.Property(x => x.IsFixed);
|
|
||||||
|
|
||||||
b.Property(x => x.Monday);
|
b.Property(x => x.Monday);
|
||||||
b.Property(x => x.Tuesday);
|
b.Property(x => x.Tuesday);
|
||||||
b.Property(x => x.Wednesday);
|
b.Property(x => x.Wednesday);
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
|
||||||
namespace Kurs.Platform.Migrations
|
namespace Kurs.Platform.Migrations
|
||||||
{
|
{
|
||||||
[DbContext(typeof(PlatformDbContext))]
|
[DbContext(typeof(PlatformDbContext))]
|
||||||
[Migration("20251005211345_Initial")]
|
[Migration("20251006064241_Initial")]
|
||||||
partial class Initial
|
partial class Initial
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
|
|
@ -6242,9 +6242,6 @@ namespace Kurs.Platform.Migrations
|
||||||
.HasDefaultValue(false)
|
.HasDefaultValue(false)
|
||||||
.HasColumnName("IsDeleted");
|
.HasColumnName("IsDeleted");
|
||||||
|
|
||||||
b.Property<bool?>("IsFixed")
|
|
||||||
.HasColumnType("bit");
|
|
||||||
|
|
||||||
b.Property<DateTime?>("LastModificationTime")
|
b.Property<DateTime?>("LastModificationTime")
|
||||||
.HasColumnType("datetime2")
|
.HasColumnType("datetime2")
|
||||||
.HasColumnName("LastModificationTime");
|
.HasColumnName("LastModificationTime");
|
||||||
|
|
@ -1139,7 +1139,6 @@ namespace Kurs.Platform.Migrations
|
||||||
Name = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
|
Name = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
|
||||||
StartHour = table.Column<string>(type: "nvarchar(8)", maxLength: 8, nullable: false),
|
StartHour = table.Column<string>(type: "nvarchar(8)", maxLength: 8, nullable: false),
|
||||||
EndHour = table.Column<string>(type: "nvarchar(8)", maxLength: 8, nullable: false),
|
EndHour = table.Column<string>(type: "nvarchar(8)", maxLength: 8, nullable: false),
|
||||||
IsFixed = table.Column<bool>(type: "bit", nullable: true),
|
|
||||||
Monday = table.Column<bool>(type: "bit", nullable: true),
|
Monday = table.Column<bool>(type: "bit", nullable: true),
|
||||||
Tuesday = table.Column<bool>(type: "bit", nullable: true),
|
Tuesday = table.Column<bool>(type: "bit", nullable: true),
|
||||||
Wednesday = table.Column<bool>(type: "bit", nullable: true),
|
Wednesday = table.Column<bool>(type: "bit", nullable: true),
|
||||||
|
|
@ -6239,9 +6239,6 @@ namespace Kurs.Platform.Migrations
|
||||||
.HasDefaultValue(false)
|
.HasDefaultValue(false)
|
||||||
.HasColumnName("IsDeleted");
|
.HasColumnName("IsDeleted");
|
||||||
|
|
||||||
b.Property<bool?>("IsFixed")
|
|
||||||
.HasColumnType("bit");
|
|
||||||
|
|
||||||
b.Property<DateTime?>("LastModificationTime")
|
b.Property<DateTime?>("LastModificationTime")
|
||||||
.HasColumnType("datetime2")
|
.HasColumnType("datetime2")
|
||||||
.HasColumnName("LastModificationTime");
|
.HasColumnName("LastModificationTime");
|
||||||
|
|
|
||||||
|
|
@ -148,11 +148,29 @@ function RolesPermission({
|
||||||
if (!searchTerm) {
|
if (!searchTerm) {
|
||||||
return selectedGroupPermissions
|
return selectedGroupPermissions
|
||||||
}
|
}
|
||||||
return selectedGroupPermissions.filter((p) =>
|
|
||||||
|
const lowerTerm = searchTerm.toLowerCase()
|
||||||
|
|
||||||
|
// 1️⃣ Sadece 1. kırınımdakileri (parent olmayanları değil) ara
|
||||||
|
const topLevelMatches = selectedGroupPermissions.filter(
|
||||||
|
(p) =>
|
||||||
|
!p.parentName && // parentName yoksa bu 1. kırınım demektir
|
||||||
translate('::' + p.displayName)
|
translate('::' + p.displayName)
|
||||||
.toLowerCase()
|
.toLowerCase()
|
||||||
.includes(searchTerm.toLowerCase()),
|
.includes(lowerTerm),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// 2️⃣ Her bulunan parent’ın altındaki child izinleri ekle
|
||||||
|
const result: PermissionWithStyle[] = []
|
||||||
|
topLevelMatches.forEach((parent) => {
|
||||||
|
result.push(parent)
|
||||||
|
|
||||||
|
// Alt kırılımları bul
|
||||||
|
const children = selectedGroupPermissions.filter((child) => child.parentName === parent.name)
|
||||||
|
result.push(...children)
|
||||||
|
})
|
||||||
|
|
||||||
|
return result
|
||||||
}, [selectedGroupPermissions, searchTerm, translate])
|
}, [selectedGroupPermissions, searchTerm, translate])
|
||||||
|
|
||||||
const onSelectAll = (value: boolean, e: ChangeEvent<HTMLInputElement>) => {
|
const onSelectAll = (value: boolean, e: ChangeEvent<HTMLInputElement>) => {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue