cloud-ide-core 2.0.88 → 2.0.89
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -9,7 +9,7 @@ import { Router, ActivatedRoute } from '@angular/router';
|
|
|
9
9
|
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
|
|
10
10
|
import { BehaviorSubject, throwError, Observable, Subject, takeUntil, debounceTime, distinctUntilChanged } from 'rxjs';
|
|
11
11
|
import { tap, catchError, map } from 'rxjs/operators';
|
|
12
|
-
import { coreRoutesUrl, generateStringFromObject, cidePath, hostManagerRoutesUrl, MDesignationInsertUpdatePayload, MDesignation, generateObjectFromString, userRoutesUrl, AuthUserMstGetByIdPayload, customEncrypt, customDecrypt, AuthUserMstListPayload, academicsRoutesUrl } from 'cloud-ide-lms-model';
|
|
12
|
+
import { coreRoutesUrl, generateStringFromObject, cidePath, hostManagerRoutesUrl, MDesignationInsertUpdatePayload, MDesignation, MGradeLevel, generateObjectFromString, userRoutesUrl, AuthUserMstGetByIdPayload, customEncrypt, customDecrypt, AuthUserMstListPayload, academicsRoutesUrl } from 'cloud-ide-lms-model';
|
|
13
13
|
import * as i1 from '@angular/common/http';
|
|
14
14
|
import { HttpClient } from '@angular/common/http';
|
|
15
15
|
import { NotificationService, CideEleDataGridComponent, CideEleButtonComponent, CideInputComponent, CideSelectComponent, CideTextareaComponent, CideIconComponent, CideEleDropdownComponent, ConfirmationService, CideEleGlobalNotificationsComponent, CideEleConfirmationModalComponent, CideEleJsonEditorComponent, CideEleFileInputComponent, CideEleFileImageDirective, CideFormFieldErrorComponent, CideEleFileManagerService, CideEleTabComponent, CideEleFloatingFeaturesService, CideEleToastNotificationComponent } from 'cloud-ide-element';
|
|
@@ -4054,10 +4054,16 @@ class CideCoreDesignationListComponent {
|
|
|
4054
4054
|
console.error('❌ GradeLevelService is not available');
|
|
4055
4055
|
return;
|
|
4056
4056
|
}
|
|
4057
|
-
const
|
|
4057
|
+
const activeEntityId = this.appState.getActiveEntityId();
|
|
4058
|
+
if (!activeEntityId) {
|
|
4059
|
+
console.error('❌ No active entity ID found for grade levels');
|
|
4060
|
+
return;
|
|
4061
|
+
}
|
|
4062
|
+
const requestBody = new MGradeLevel({
|
|
4058
4063
|
pageIndex: 1,
|
|
4059
|
-
pageSize: 100 // Load all grade levels for dropdown
|
|
4060
|
-
|
|
4064
|
+
pageSize: 100, // Load all grade levels for dropdown
|
|
4065
|
+
sydsgl_entity_id_syen: activeEntityId
|
|
4066
|
+
});
|
|
4061
4067
|
this.gradeLevelService.getGradeLevelList(requestBody)
|
|
4062
4068
|
.pipe(takeUntilDestroyed(this.destroyRef))
|
|
4063
4069
|
.subscribe({
|
|
@@ -5332,12 +5338,20 @@ class CideCoreGradeLevelListComponent {
|
|
|
5332
5338
|
console.log('🚀 CideCoreGradeLevelListComponent.loadGradeLevels() called');
|
|
5333
5339
|
this.loading.set(true);
|
|
5334
5340
|
this.error.set(null);
|
|
5335
|
-
const
|
|
5341
|
+
const activeEntityId = this.appState.getActiveEntityId();
|
|
5342
|
+
if (!activeEntityId) {
|
|
5343
|
+
console.error('❌ No active entity ID found');
|
|
5344
|
+
this.error.set('No active entity selected');
|
|
5345
|
+
this.loading.set(false);
|
|
5346
|
+
return;
|
|
5347
|
+
}
|
|
5348
|
+
const requestBody = new MGradeLevel({
|
|
5336
5349
|
total: this.totalItems(),
|
|
5337
5350
|
pageIndex: this.currentPage(),
|
|
5338
5351
|
pageSize: this.pageSize(),
|
|
5339
|
-
query: this.searchTerm()
|
|
5340
|
-
|
|
5352
|
+
query: this.searchTerm(),
|
|
5353
|
+
sydsgl_entity_id_syen: activeEntityId
|
|
5354
|
+
});
|
|
5341
5355
|
console.log('📋 Request body:', requestBody);
|
|
5342
5356
|
if (!this.gradeLevelService) {
|
|
5343
5357
|
console.error('❌ GradeLevelService is not available');
|