Егор финал оформления1
This commit is contained in:
GokaPek
parent
495bafb4e3
commit
acbac6aadb
@ -4,7 +4,7 @@
|
||||
List<StudentViewModel> students = ViewBag.Students;
|
||||
}
|
||||
@{
|
||||
ViewData["Title"] = "Manage Disciplines";
|
||||
ViewData["Title"] = "Управление дисциплинами";
|
||||
}
|
||||
|
||||
<div class="text-center">
|
||||
@ -14,26 +14,26 @@
|
||||
|
||||
<form method="post">
|
||||
<div class="row">
|
||||
<div class="col-4">Name:</div>
|
||||
<div class="col-4">Название:</div>
|
||||
<div class="col-8">
|
||||
<input type="text" name="name" id="name" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-4">Description:</div>
|
||||
<div class="col-4">Описание:</div>
|
||||
<div class="col-8">
|
||||
<textarea name="description" id="description" class="form-control"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-4">Date:</div>
|
||||
<div class="col-4">Дата:</div>
|
||||
<div class="col-8">
|
||||
<input type="date" name="date" id="date" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-4">Teacher:</div>
|
||||
<div class="col-4">Преподаватель:</div>
|
||||
<div class="col-8">
|
||||
<select id="teacher" name="teacher" class="form-control" asp-items="@(new SelectList(@ViewBag.Teachers,"Id", "Name"))"></select>
|
||||
</div>
|
||||
@ -41,7 +41,7 @@
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-4">Students:</div>
|
||||
<div class="col-4">Студенты:</div>
|
||||
<div class="col-8">
|
||||
<div class="scrollable-list">
|
||||
@foreach (var student in students)
|
||||
@ -69,11 +69,11 @@
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Description</th>
|
||||
<th>Date</th>
|
||||
<th>Teacher Name</th>
|
||||
<th>Actions</th>
|
||||
<th>Имя</th>
|
||||
<th>Описание</th>
|
||||
<th>Дата</th>
|
||||
<th>Имя учителя</th>
|
||||
<th>Действие</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
ViewData["Title"] = "Enter";
|
||||
}
|
||||
<div class="text-center">
|
||||
<h2 class="display-4">Loggin in</h2>
|
||||
<h2 class="display-4">Вход</h2>
|
||||
</div>
|
||||
<form method="post">
|
||||
<div class="row">
|
||||
<div class="col-4">Login:</div>
|
||||
<div class="col-4">Логин:</div>
|
||||
<div class="col-8"><input type="text" name="login" /></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-4">Password:</div>
|
||||
<div class="col-4">Пароль:</div>
|
||||
<div class="col-8"><input type="password" name="password" /></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
<div class="text-center">
|
||||
<div class="menu">
|
||||
<a href="/Home/Disciplines">Disciplines</a>
|
||||
<a href="/Home/Teachers">Teachers</a>
|
||||
<a href="/Home/Statements">Statements</a>
|
||||
<a href="/Home/Report">Report</a>
|
||||
<a href="/Home/ReportDisciplines">ReportDisciplines</a>
|
||||
<a href="/Home/Disciplines">Дисциплины</a>
|
||||
<a href="/Home/Teachers">Преподаватели</a>
|
||||
<a href="/Home/Statements">Ведомости</a>
|
||||
<a href="/Home/Report">Отчёты по преподавателям</a>
|
||||
<a href="/Home/ReportDisciplines">Отчёты по дисциплинам</a>
|
||||
</div>
|
||||
<div class="header">
|
||||
<img src="" alt="Logo" class="logo">
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
@{
|
||||
ViewData["Title"] = "Privacy Policy";
|
||||
ViewData["Title"] = "Прайваси";
|
||||
}
|
||||
<h1>@ViewData["Title"]</h1>
|
||||
|
||||
<p>Use this page to detail your site's privacy policy.</p>
|
||||
<p>Прайваси</p>
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
ViewData["Title"] = "Register";
|
||||
}
|
||||
<div class="text-center">
|
||||
<h2 class="display-4">Registration</h2>
|
||||
<h2 class="display-4">Регистрация</h2>
|
||||
</div>
|
||||
<form method="post">
|
||||
<div class="row">
|
||||
<div class="col-4">Login:</div>
|
||||
<div class="col-4">Логин:</div>
|
||||
<div class="col-8"><input type="text" name="login" /></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-4">Password:</div>
|
||||
<div class="col-4">Пароль:</div>
|
||||
<div class="col-8"><input type="password" name="password" /></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@using UniversityContracts.ViewModels
|
||||
@model List<ReportTeacherViewModel>
|
||||
@{
|
||||
ViewData["Title"] = "Report by teachers and students";
|
||||
ViewData["Title"] = "Отчёты по преподавателям со студентами";
|
||||
}
|
||||
|
||||
<div class="text-center">
|
||||
@ -29,8 +29,8 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Id</th>
|
||||
<th>Teacher name</th>
|
||||
<th>Student</th>
|
||||
<th>Имя преподавателя</th>
|
||||
<th>Студент</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@using UniversityContracts.ViewModels
|
||||
@model List<StatementViewModel>
|
||||
@{
|
||||
ViewData["Title"] = "Manage Statement Records";
|
||||
ViewData["Title"] = "Управление ведомостями";
|
||||
}
|
||||
|
||||
<div class="text-center">
|
||||
@ -12,19 +12,19 @@
|
||||
|
||||
<form method="post">
|
||||
<div class="row">
|
||||
<div class="col-4">Title:</div>
|
||||
<div class="col-4">Название:</div>
|
||||
<div class="col-8">
|
||||
<input type="text" name="name" id="name" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-4">Date:</div>
|
||||
<div class="col-4">Дата:</div>
|
||||
<div class="col-8">
|
||||
<input type="datetime-local" name="date" id="date" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-4">Teacher:</div>
|
||||
<div class="col-4">Преподаватель:</div>
|
||||
<div class="col-8">
|
||||
<select id="teacher" name="teacher" class="form-control" asp-items="@(new SelectList(@ViewBag.Teachers,"Id", "Name"))"></select>
|
||||
</div>
|
||||
@ -41,9 +41,9 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Id</th>
|
||||
<th>Title</th>
|
||||
<th>Date</th>
|
||||
<th>Teacher</th>
|
||||
<th>Название</th>
|
||||
<th>Дата</th>
|
||||
<th>Преподаватель</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>@foreach (var item in Model)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@using UniversityContracts.ViewModels
|
||||
@model List<TeacherViewModel>
|
||||
@{
|
||||
ViewData["Title"] = "Manage Teachers";
|
||||
ViewData["Title"] = "Преподаватели";
|
||||
}
|
||||
|
||||
<div class="text-center">
|
||||
@ -11,19 +11,19 @@
|
||||
|
||||
<form method="post">
|
||||
<div class="row">
|
||||
<div class="col-4">Name:</div>
|
||||
<div class="col-4">Имя:</div>
|
||||
<div class="col-8">
|
||||
<input type="text" name="name" id="name" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-4">Academic Degree:</div>
|
||||
<div class="col-4">Учёная степень:</div>
|
||||
<div class="col-8">
|
||||
<input type="text" name="academicDegree" id="academicDegree" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-4">Position:</div>
|
||||
<div class="col-4">Должность:</div>
|
||||
<div class="col-8">
|
||||
<input type="text" name="position" id="position" class="form-control" />
|
||||
</div>
|
||||
@ -40,9 +40,9 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Id</th>
|
||||
<th>Name</th>
|
||||
<th>Academic Degree</th>
|
||||
<th>Position</th>
|
||||
<th>Имя</th>
|
||||
<th>Учёная степень</th>
|
||||
<th>Должность</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@ -20,10 +20,25 @@
|
||||
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
|
||||
<ul class="navbar-nav flex-grow-1">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
|
||||
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Главная</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
|
||||
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Прайваси</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Disciplines">Дисциплины</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Teachers">Преподаватели</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Statements">Ведомости</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Report">Отчёты по преподавателям и студентам</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="ReportDisciplines">Отчёт по дисциплинам</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -98,7 +98,7 @@ namespace UniversityDatabaseImplement.Implements
|
||||
|
||||
if (model.DateFrom.HasValue && model.DateTo.HasValue)
|
||||
{
|
||||
query = query.Where(x => model.DateFrom.Value <= x.Date && x.Date <= model.DateTo.Value);
|
||||
//query = query.Where(x => model.DateFrom.Value <= x.Date && x.Date <= model.DateTo.Value);
|
||||
|
||||
|
||||
var x = query.Select(x => x.GetViewModel).ToList();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user