ตัวชี้วัดเเละหลักสูตร

src/app/components/competency-assessment/competency-management/indicators-and-curriculum/edit-group-indicators/edit-group-indicators.ts → src/app/components/competency-assessment/competency-management/indicators-and-curriculum/edit-group-indicators/edit-group-indicators.component.ts

@@ -28,8 +28,8 @@ export interface CurriculumModal {
 }
 @Component({
 	selector: 'app-edit-group-indicators',
-	templateUrl: './edit-group-indicators.html',
-	styleUrls: ['./edit-group-indicators.scss']
+	templateUrl: './edit-group-indicators.component.html',
+	styleUrls: ['./edit-group-indicators.component.scss']
 })
 export class EditGroupIndicators implements OnInit {
 	@Input() competencytopic: CompetencytopicModel = new MyCompetencytopicModel({})
@@ -149,14 +149,14 @@ export class EditGroupIndicators implements OnInit {
 						assessmentTools.push([]);
 					}
 					return {
-						code: x.lineNo + '',
+						code: x.lineNo + '' || '0',
 						behaviorIndicators,
 						assessmentTools,
 						curriculum: x.competencyCourse.map(x => ({ code: x.competencyCourseId, name: x.tdesc }))
 					};
 				});
 				this.dataList.sort((a, b) => +a.code - +b.code)
-				let maxCode = Math.max(...this.dataList.map(x => +x.code))
+				let maxCode = Math.max(-1, ...this.dataList.map(x => +x.code))
 				while (this.dataList.length < +this.indicatorsCourses.competencyTopic.expectationLevel) {
 					this.dataList.push({
 						code: (++maxCode) + "",
@@ -165,6 +165,7 @@ export class EditGroupIndicators implements OnInit {
 						curriculum: []
 					})
 				}
+				console.log(this.dataList)
 				this.dataLoading = false
 				this.searchChange()
 				this.cdr.detectChanges()

src/app/components/dashboard/dashboard.module.ts

@@ -62,7 +62,7 @@ import { CourseRegistrationComponent } from '../competency-assessment/course-reg
 import { DevelopmentCourseComponent } from '../competency-assessment/course-registration/development-course/development-course.component';
 import { CompetencyManagementComponent } from '../competency-assessment/competency-management/competency-management.component';
 import { IndicatorsAndCurriculumComponent } from '../competency-assessment/competency-management/indicators-and-curriculum/indicators-and-curriculum.component';
-import { EditGroupIndicators } from '../competency-assessment/competency-management/indicators-and-curriculum/edit-group-indicators/edit-group-indicators';
+import { EditGroupIndicators } from '../competency-assessment/competency-management/indicators-and-curriculum/edit-group-indicators/edit-group-indicators.component';
 import { GroupCompetenciesComponent } from '../competency-assessment/competency-management/group-competencies/group-competencies.component';
 import { EditGroupCompetenciesComponent } from '../competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component';
 import { EvaluationCycleManagerComponent } from '../competency-assessment/evaluation-cycle-manager/evaluation-cycle-manager.component';

src/app/components/performance-management-evaluation/assessment-management/assessment-management.component.html

@@ -23,14 +23,14 @@
                 </a>
             </nav>
         </div>
-        <div class="mt-3 px-3rem">
+        <div class="mt-3 px-2rem !-mt-3 pt-50px">
             <div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1"
                 *ngIf="activeTab === 'underline-1'">
                 <app-evaluation-grouping *ngIf="groupShow=='1'" [pathTitle]="pathTitle"
-                    (sendPathTitle)="pathTitle=$event"
-                    (sendGroupShow)="groupShow=$event"></app-evaluation-grouping>
+                    (sendPathTitle)="pathTitle=$event" (sendGroupShow)="groupShow=$event"></app-evaluation-grouping>
                 <app-edit-evaluation-grouping *ngIf="groupShow=='2'" [pathTitle]="pathTitle"
-                    (sendPathTitle)="pathTitle=$event" (sendGroupShow)="groupShow=$event"></app-edit-evaluation-grouping>
+                    (sendPathTitle)="pathTitle=$event"
+                    (sendGroupShow)="groupShow=$event"></app-edit-evaluation-grouping>
             </div>
             <div id="underline-2" role="tabpanel" aria-labelledby="underline-item-2"
                 *ngIf="activeTab === 'underline-2'">