Skip to content

Commit be486ee

Browse files
committed
Merge branch 'master' of github.com:microting/eform-backendconfiguration-plugin
2 parents 4515764 + c7ad4de commit be486ee

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/BackendConfiguration.Pn.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,10 @@
227227
<PackageReference Include="Microting.eFormCaseTemplateBase" Version="8.0.91" />
228228
<PackageReference Include="Microting.ItemsPlanningBase" Version="8.0.91" />
229229
<PackageReference Include="Microting.TimePlanningBase" Version="9.0.29" />
230-
<PackageReference Include="QuestPDF" Version="2025.1.7" />
230+
<PackageReference Include="QuestPDF" Version="2025.4.0" />
231231
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.0.1" />
232232
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.116.1" />
233-
<PackageReference Include="Sentry" Version="5.5.0" />
233+
<PackageReference Include="Sentry" Version="5.5.1" />
234234
</ItemGroup>
235235

236236
<ItemGroup>

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationTaskWizardService/BackendConfigurationTaskWizardService.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ public async Task<OperationResult> CreateTask(TaskWizardCreateModel createModel)
415415
var planning = new Planning
416416
{
417417
CreatedAt = DateTime.UtcNow,
418+
UpdatedAt = DateTime.UtcNow,
418419
IsEditable = false,
419420
Enabled = createModel.Status == TaskWizardStatuses.Active,
420421
IsLocked = true,
@@ -502,6 +503,8 @@ public async Task<OperationResult> CreateTask(TaskWizardCreateModel createModel)
502503
var areRule = new AreaRule
503504
{
504505
CreatedInGuide = true,
506+
CreatedAt = planning.CreatedAt,
507+
UpdatedAt = planning.UpdatedAt,
505508
AreaId = areaId,
506509
AreaRuleTranslations = createModel.Translates
507510
.Select(t => new AreaRuleTranslation
@@ -526,6 +529,8 @@ public async Task<OperationResult> CreateTask(TaskWizardCreateModel createModel)
526529
[
527530
new()
528531
{
532+
CreatedAt = planning.CreatedAt,
533+
UpdatedAt = planning.UpdatedAt,
529534
AreaId = areaId,
530535
FolderId = (int)createModel.FolderId,
531536
ItemPlanningId = planning.Id,

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-table/task-wizard-table.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
<ng-template #idTpl let-row>
5858
<ng-container *ngIf="selectAuthIsAdmin$ | async;">
59-
<span title="{{row.createdAt}}">{{row.id}}<small class="microting-uid"> ({{row.planningId}})</small></span>
59+
<span title="{{getFormattedDate(row.createdAt)}} / {{getFormattedDate(row.updatedAt)}}">{{row.id}}<small class="microting-uid"> ({{row.planningId}})</small></span>
6060
</ng-container>
6161
<ng-container *ngIf="(selectAuthIsAdmin$ | async) !== true;">
6262
<span>{{row.id}}<small class="microting-uid"> ({{row.planningId}})</small></span>

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-wizard/components/task-wizard-table/task-wizard-table.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ export class TaskWizardTableComponent implements OnInit, OnDestroy {
150150
return format(row.startDate, 'P', {locale: this.authStateService.dateFnsLocale});
151151
}
152152

153+
getFormattedDate(date: Date) {
154+
return format(date, 'P', {locale: this.authStateService.dateFnsLocale});
155+
}
156+
153157
onClickTag(tag: CommonDictionaryModel) {
154158
this.taskWizardStateService.addTagToFilters(tag);
155159
// this.updateTable.emit();

0 commit comments

Comments
 (0)