Web - Admin - School

Fjarik · Feb 1, 2020 · 3dea137 · 3dea137
1 parent 9ffdc12
commit 3dea137
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 28 deletions.
diff --git a/ZolikyWeb/Areas/Global/Controllers/UserController.cs b/ZolikyWeb/Areas/Global/Controllers/UserController.cs
@@ -53,17 +53,18 @@ public async Task<JsonResult> UsersJson()
 					timeS = x.MemberSince.GetJsTimestamp(),
 					regIp = x.RegistrationIp
 				},
-				lastLogin = x.LastLogin == null
-								? new {
-									date = "",
-									timeS = 0.0,
-									project = ""
-								}
-								: new {
-									date = x.LastLogin.Date.ToString("dd.MM.yyyy"),
-									timeS = x.LastLogin.Date.GetJsTimestamp(),
-									project = ((Projects) x.LastLogin.ProjectID).GetDescription()
-								},
+				school = x.SchoolName,
+				//lastLogin = x.LastLogin == null
+				//				? new {
+				//					date = "",
+				//					timeS = 0.0,
+				//					project = ""
+				//				}
+				//				: new {
+				//					date = x.LastLogin.Date.ToString("dd.MM.yyyy"),
+				//					timeS = x.LastLogin.Date.GetJsTimestamp(),
+				//					project = ((Projects) x.LastLogin.ProjectID).GetDescription()
+				//				},
 				x.IsBanned,
 				x.IsEnabled,
 				actions = new {

diff --git a/ZolikyWeb/Areas/Global/Views/User/Dashboard.cshtml b/ZolikyWeb/Areas/Global/Views/User/Dashboard.cshtml
@@ -55,6 +55,21 @@
 								data.grad}">${data.name}</span>`;
 						}
 					},
+					{
+						title: "Škola",
+						type: "html",
+						className: "text-truncate",
+						data: "school",
+						render: (data) => {
+							if (!data) {
+								return "-";
+							}
+							if (data.length < 33) {
+								return data;
+							}
+							return `<span class="c-help" data-toggle="tooltip" data-original-title="${data}">${data.substr(0, 33)}...</span>`;
+						}
+					},
 					{
 						title: "Role",
 						data: "roles",
@@ -84,23 +99,23 @@
 							}
 						}
 					},
-					{
-						title: "Poslední přihlášení",
-						type: "html ",
-						data: "lastLogin",
-						searchable: false,
-						render: {
-							_: "timeS",
-							display: (data) => {
-								if (!data) {
-									return "";
-								}
-								return `<span class="c-help" data-toggle="tooltip" data-original-title="${data.project
-									}">${data.date}</span>`;
-							}
-						}
+					//{
+					//	title: "Poslední přihlášení",
+					//	type: "html ",
+					//	data: "lastLogin",
+					//	searchable: false,
+					//	render: {
+					//		_: "timeS",
+					//		display: (data) => {
+					//			if (!data) {
+					//				return "";
+					//			}
+					//			return `<span class="c-help" data-toggle="tooltip" data-original-title="${data.project
+					//				}">${data.date}</span>`;
+					//		}
+					//	}
 
-					},
+					//},
 					{
 						title: "Akce",
 						type: "html",

diff --git a/ZolikyWeb/Properties/AssemblyInfo.cs b/ZolikyWeb/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.6.14.0")]
+[assembly: AssemblyVersion("2.6.15.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: NeutralResourcesLanguage("cs-CZ")]