principal-dashboard-lib-v2 0.0.24 → 0.0.26
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.
- package/bundles/principal-dashboard-lib-v2.umd.js +16 -4
- package/bundles/principal-dashboard-lib-v2.umd.js.map +1 -1
- package/bundles/principal-dashboard-lib-v2.umd.min.js +1 -1
- package/bundles/principal-dashboard-lib-v2.umd.min.js.map +1 -1
- package/esm2015/lib/chartheader/chartheader.component.js +2 -2
- package/esm2015/lib/exceldata.service.js +9 -3
- package/esm2015/lib/principal-dashboard-lib-v2.service.js +8 -2
- package/fesm2015/principal-dashboard-lib-v2.js +16 -4
- package/fesm2015/principal-dashboard-lib-v2.js.map +1 -1
- package/lib/exceldata.service.d.ts +1 -0
- package/lib/principal-dashboard-lib-v2.service.d.ts +1 -0
- package/package.json +1 -1
- package/principal-dashboard-lib-v2.metadata.json +1 -1
|
@@ -126,6 +126,12 @@
|
|
|
126
126
|
// this.resoureMetaData = resourceMetadataMatrix;
|
|
127
127
|
return resourceMetadataMatrix;
|
|
128
128
|
};
|
|
129
|
+
PrincipalDashboardLibV2Service.prototype.getName = function (user) {
|
|
130
|
+
if (/School Admin/gm.exec(user.role)) {
|
|
131
|
+
return "Support Admin";
|
|
132
|
+
}
|
|
133
|
+
return user.fullName;
|
|
134
|
+
};
|
|
129
135
|
PrincipalDashboardLibV2Service.prototype.genarateUserReqiuredData = function (data) {
|
|
130
136
|
this.isUserReqiuredDataReady.next(false);
|
|
131
137
|
var usersMetadataMatrix = new Array();
|
|
@@ -146,7 +152,7 @@
|
|
|
146
152
|
userId = usersMetadata[i_1].userId;
|
|
147
153
|
//console.log("--chartDataUserWise-->>",usersMetadata[i].terminalIP)
|
|
148
154
|
if (usersMetadata[i_1].fullName !== undefined) {
|
|
149
|
-
userName = usersMetadata[i_1]
|
|
155
|
+
userName = this.getName(usersMetadata[i_1]); // get name of user w.r.t. ID
|
|
150
156
|
}
|
|
151
157
|
else {
|
|
152
158
|
userName = '';
|
|
@@ -881,7 +887,7 @@
|
|
|
881
887
|
this.isChartView = true;
|
|
882
888
|
}
|
|
883
889
|
ChartheaderComponent.prototype.ngOnInit = function () {
|
|
884
|
-
this.libVersion = "0.0.
|
|
890
|
+
this.libVersion = "0.0.26";
|
|
885
891
|
// this.myIcon = document.getElementById('myIconImg');
|
|
886
892
|
// this.changeChatType()
|
|
887
893
|
};
|
|
@@ -1895,6 +1901,12 @@
|
|
|
1895
1901
|
this.resourceTypes = __spread(new Set(this.resourceTypes));
|
|
1896
1902
|
return resourceMetadataMatrix;
|
|
1897
1903
|
};
|
|
1904
|
+
ExceldataService.prototype.getName = function (user) {
|
|
1905
|
+
if (/School Admin/gm.exec(user.role)) {
|
|
1906
|
+
return "Support Admin";
|
|
1907
|
+
}
|
|
1908
|
+
return user.fullName;
|
|
1909
|
+
};
|
|
1898
1910
|
ExceldataService.prototype.genarateUserReqiuredData_Excel = function (data) {
|
|
1899
1911
|
var userConsole = data.usersConsole.userConsole;
|
|
1900
1912
|
var usersMetadata = data.usersMetadata.userMetadata;
|
|
@@ -1912,7 +1924,7 @@
|
|
|
1912
1924
|
if (usersMetadata[i_1].userId != "") {
|
|
1913
1925
|
userId = usersMetadata[i_1].userId;
|
|
1914
1926
|
if (usersMetadata[i_1].fullName !== undefined) {
|
|
1915
|
-
userName = usersMetadata[i_1]
|
|
1927
|
+
userName = this.getName(usersMetadata[i_1]); // get name of user w.r.t. ID
|
|
1916
1928
|
}
|
|
1917
1929
|
else {
|
|
1918
1930
|
userName = '';
|
|
@@ -2297,7 +2309,7 @@
|
|
|
2297
2309
|
// }
|
|
2298
2310
|
// console.log("this.resourceTypes",this.resourceTypes)
|
|
2299
2311
|
var user = {
|
|
2300
|
-
Name: userMetadataList[i]
|
|
2312
|
+
Name: this.getName(userMetadataList[i]),
|
|
2301
2313
|
Subjects: userMetadataList[i].userSubjects,
|
|
2302
2314
|
duration: duration,
|
|
2303
2315
|
ClassRooms: ClassRooms,
|