Skip to content

Commit 2b62829

Browse files
committed
Merge branch 'stable' of github.com:microting/eform-backendconfiguration-plugin into stable
2 parents 8a772e5 + 436c94e commit 2b62829

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Helpers/BackendConfigurationTaskTrackerHelper.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ public static async Task<OperationDataResult<List<TaskTrackerModel>>> Index(
7070
.Select(x => new
7171
{
7272
x.PropertyId, x.PlanningId, x.Deadline, x.MicrotingSdkCaseId, x.MicrotingSdkeFormId, x.Id, x.AreaId,
73-
x.PlanningCaseSiteId
73+
x.PlanningCaseSiteId,
74+
x.MovedToExpiredFolder
7475
})
7576
.ToListAsync();
7677

@@ -289,6 +290,7 @@ public static async Task<OperationDataResult<List<TaskTrackerModel>>> Index(
289290
SdkFolderName =
290291
folderTranslations.FirstOrDefault(x => x.FolderId == planning.SdkFolderId) == null ? "" : folderTranslations.First(x => x.FolderId == planning.SdkFolderId).Name,
291292
CreatedInWizard = areaRuleCreatedInWizard,
293+
MovedToExpiredFolder = compliance.MovedToExpiredFolder
292294
};
293295

294296
if (complianceModel.SdkCaseId == 0 && complianceModel.DeadlineTask < dateTimeNow)

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Models/TaskTracker/TaskTrackerModel.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class TaskTrackerModel
4747
/// <summary>
4848
/// Gets or sets the tags of the task tracker model.
4949
/// </summary>
50-
public List<CommonTagModel> Tags { get; set; }
50+
public List<CommonTagModel> Tags { get; set; }
5151
= [];
5252

5353
/// <summary>
@@ -130,4 +130,6 @@ public class TaskTrackerModel
130130
public string SdkFolderName { get; set; }
131131

132132
public bool CreatedInWizard { get; set; }
133+
134+
public bool MovedToExpiredFolder { get; set; }
133135
}

eform-client/src/app/plugins/modules/backend-configuration-pn/models/task-tracker/task.model.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export interface TaskModel {
2323
weeks: WeekListModel[];
2424
sdkFolderName: string;
2525
createdInWizard: boolean;
26+
movedToExpiredFolder: boolean
2627
}
2728

2829
export interface WeekListModel {

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ export class TaskTrackerTableComponent implements OnInit, OnChanges {
4848
enabledHeadersNumber: number = 7;
4949
propertyHeaderEnabled: boolean = false;
5050
currentDate: Date = this.setDate(new Date());
51-
// changedate is "2025-10-30 00:00:00"
52-
parsedDate = Date.parse('2025-11-15 00:00:00');
53-
changeDate: Date = new Date(this.parsedDate);
5451

5552
tableHeaders: MtxGridColumn[] = [
5653
{header: this.translateService.stream('Id'), field: 'complianceId', sortProp: {id: 'Id'}, sortable: false},
@@ -77,15 +74,15 @@ export class TaskTrackerTableComponent implements OnInit, OnChanges {
7774
buttons: [ // action buttons for each row
7875
{
7976
// eslint-disable-next-line max-len
80-
iif: (record: TaskModel) => (record.createdInWizard && !record.taskIsExpired) || (record.taskIsExpired && record.createdInWizard && record.deadlineTask < this.changeDate),
77+
iif: (record: TaskModel) => (record.createdInWizard && !record.taskIsExpired) || (record.taskIsExpired && record.createdInWizard && !record.movedToExpiredFolder),
8178
type: 'icon',
8279
icon: 'edit',
8380
tooltip: this.translateService.stream('Edit'),
8481
click: (record: TaskModel) => this.redirectToCompliance(record),
8582
},
8683
{
8784
// eslint-disable-next-line max-len
88-
iif: (record: TaskModel) => record.createdInWizard && record.deadlineTask < this.changeDate,
85+
iif: (record: TaskModel) => record.createdInWizard && !record.movedToExpiredFolder,
8986
type: 'icon',
9087
tooltip: this.translateService.stream('Delete Case'),
9188
icon: 'delete',

0 commit comments

Comments
 (0)