diff --git a/HRM.UI/ClientApp/src/app/app.api.service.ts b/HRM.UI/ClientApp/src/app/app.api.service.ts
index 34679f7..8c79343 100644
--- a/HRM.UI/ClientApp/src/app/app.api.service.ts
+++ b/HRM.UI/ClientApp/src/app/app.api.service.ts
@@ -13,7 +13,7 @@ export class ApiService {
 
     public isSSO = false;
     public versionDeployement = false;
-    public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 0, 16))}-`+"01";
+    public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 5))}-`+"01";
     public static BASE_URL = '';
     public base_url = '';
     // public currentLink = '';
diff --git a/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.html b/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.html
index ec22198..460a2de 100644
--- a/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.html
+++ b/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.html
@@ -11,13 +11,25 @@
                 <app-employee-picker [MultiSelect]="true"
                     (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
             </div>
+            <div class="rosterAssignmentControls">
+                <strong>
+                    <label>Roster Type: </label>
+                </strong>
+            </div>
+            <div class="rosterAssignmentControls">
+                <kendo-dropdownlist [(ngModel)]="selectedWorkPlanTypeIsFixed" [data]="workPlanTypes"
+                    [defaultItem]="{ text: 'Select Roster Type..', value: null }" [textField]="'text'" [valueField]="'value'"
+                    (valueChange)="onChangeWorkPlanType($event)" [valuePrimitive]="true"
+                    class="form-control form-control-sm input-sm" formControlName="type">
+                </kendo-dropdownlist>
+            </div>
             <div class="rosterAssignmentControls">
                 <strong>
                     <label>Roster: </label>
                 </strong>
             </div>
             <div class="rosterAssignmentControls">
-                <kendo-dropdownlist [(ngModel)]="selectedWorkPlanID" [data]="workPlanGroupList"
+                <kendo-dropdownlist [(ngModel)]="selectedWorkPlanID" [data]="workPlanGroupListByType"
                     [defaultItem]="{ name: 'Select..', value: null }" [textField]="'name'" [valueField]="'id'"
                     (valueChange)="populateEmpWorkPlanByWorkGroup($event)" [valuePrimitive]="true"
                     class="form-control form-control-sm input-sm" formControlName="group">
diff --git a/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.ts b/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.ts
index 63d58b4..094b4d8 100644
--- a/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.ts
+++ b/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.ts
@@ -31,16 +31,23 @@ export class EchotexRosterAssignmentComponent implements OnInit {
     workPlanGroupName = '';
     workPlanGroupInitialShift = '';
     workPlanGroupList: WorkPlanGroup[];
+    workPlanGroupListByType: WorkPlanGroup[] = [];
     selectedEmployees: SearchEmployee[];
     employees: Employee[];
     empIds: number[] = [];
     exportExcelFileName: string = '';
 
+    selectedWorkPlanTypeIsFixed: boolean;
     selectedWorkPlanID: number;
     fixedWorkPlan: boolean = true;
     startDate: Date;
     holidayDayOfWeekArray = Object.values(HolidayDayOfWeek);
 
+    workPlanTypes: { text: string, value: boolean| null }[] = [
+        { text: 'Fixed', value: true },
+        { text: 'Counter Clock', value: false }
+    ]
+
     constructor(public employeeService: EmployeeServices,
         public attendanceServices: AttendanceServices,
         public apiService: ApiService,
@@ -85,6 +92,7 @@ export class EchotexRosterAssignmentComponent implements OnInit {
 
     createForm() {
         this.rosterAssignmentForm = new FormBuilder().group({
+            type: ['', Validators.required],
             group: ['', Validators.required],
             startDate: [''],
         });
@@ -202,13 +210,13 @@ export class EchotexRosterAssignmentComponent implements OnInit {
         this.loadingPanel.ShowLoadingPanel = true;
         this.empWorkPlanSetupList = [];
         debugger;
-        if (workPlanGroup.type != EnumWorkPlanGroup.Fixed &&
-            (workPlanGroup.type != undefined || workPlanGroup.type != null)) {
-            this.fixedWorkPlan = false;
-            this.startDate = new Date();
-        } else {
-            this.fixedWorkPlan = true;
-        }
+        // if (workPlanGroup.type != EnumWorkPlanGroup.Fixed &&
+        //     (workPlanGroup.type != undefined || workPlanGroup.type != null)) {
+        //     this.fixedWorkPlan = false;
+        //     this.startDate = new Date();
+        // } else {
+        //     this.fixedWorkPlan = true;
+        // }
         this.attendanceServices.getEmployeeWorkPlanSetupByWPGroupID(workPlanGroup.id).subscribe(
             (resp) => {
                 this.empWorkPlanSetupList = resp;
@@ -331,7 +339,7 @@ export class EchotexRosterAssignmentComponent implements OnInit {
         );
     }
 
-    public getHolidayDayOfWeek( day: number): string {
+    public getHolidayDayOfWeek(day: number): string {
         debugger;
         day = day + 1;
         switch (day) {
@@ -365,4 +373,23 @@ export class EchotexRosterAssignmentComponent implements OnInit {
     //     return dayIndex as EnumDayOfWeek;
     // }
 
+    
+    onChangeWorkPlanType(type: any) {
+        this.empWorkPlanSetupList = [];
+        this.workPlanGroupListByType = [];
+        this.selectedWorkPlanID = null;
+        this.fixedWorkPlan = true;
+        if (type == undefined || type == null) {
+            return;
+        }
+        else if (type){
+            this.workPlanGroupListByType = this.workPlanGroupList.filter(y => y.type == EnumWorkPlanGroup.Fixed);
+        }
+        else {
+            this.workPlanGroupListByType = this.workPlanGroupList.filter(y => y.type != EnumWorkPlanGroup.Fixed);
+            this.fixedWorkPlan = false;
+            this.startDate = new Date();
+        }
+    }
+
 }