|
|
@ -33,7 +33,6 @@
|
|
|
|
class="alert alert-danger">Incorrect title</p>
|
|
|
|
class="alert alert-danger">Incorrect title</p>
|
|
|
|
<p class="help-block text-danger"></p>
|
|
|
|
<p class="help-block text-danger"></p>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<div class="form-group">
|
|
|
|
<div class="form-group">
|
|
|
|
<label for="status">Статус:</label>
|
|
|
|
<label for="status">Статус:</label>
|
|
|
|
<select class="form-control" th:field="*{status}" id="status">
|
|
|
|
<select class="form-control" th:field="*{status}" id="status">
|
|
|
@ -42,13 +41,11 @@
|
|
|
|
</option>
|
|
|
|
</option>
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<div class="form-group">
|
|
|
|
<div class="form-group">
|
|
|
|
<label for="comment">Комментарий:</label>
|
|
|
|
<label for="comment">Комментарий:</label>
|
|
|
|
<textarea class="form-control" rows="3" id="comment"
|
|
|
|
<textarea class="form-control" rows="3" id="comment"
|
|
|
|
th:field="*{comment}"></textarea>
|
|
|
|
th:field="*{comment}"></textarea>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<div class="form-group">
|
|
|
|
<div class="form-group">
|
|
|
|
<label>Дедлайны показателей:</label>
|
|
|
|
<label>Дедлайны показателей:</label>
|
|
|
|
<div class="row" th:each="deadline, rowStat : *{deadlines}">
|
|
|
|
<div class="row" th:each="deadline, rowStat : *{deadlines}">
|
|
|
@ -77,7 +74,6 @@
|
|
|
|
<input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
|
|
|
|
<input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
|
|
|
|
value="Добавить дедлайн"/>
|
|
|
|
value="Добавить дедлайн"/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<div class="form-group">
|
|
|
|
<div class="form-group">
|
|
|
|
<label for="loader">Загрузить заявку:</label>
|
|
|
|
<label for="loader">Загрузить заявку:</label>
|
|
|
|
<div id="loader">
|
|
|
|
<div id="loader">
|
|
|
@ -91,7 +87,8 @@
|
|
|
|
aria-expanded="false"
|
|
|
|
aria-expanded="false"
|
|
|
|
aria-controls="collapse-filter">Фильтр рабочей группы
|
|
|
|
aria-controls="collapse-filter">Фильтр рабочей группы
|
|
|
|
</label>
|
|
|
|
</label>
|
|
|
|
<div th:class="${grantDto.wasLeader || grantDto.birthDate || grantDto.degree} ? 'form-check' : 'form-check collapse'" id="collapse-filter">
|
|
|
|
<div th:class="${grantDto.wasLeader || grantDto.birthDate || grantDto.degree} ?
|
|
|
|
|
|
|
|
'form-check' : 'form-check collapse'" id="collapse-filter">
|
|
|
|
<div class="row">
|
|
|
|
<div class="row">
|
|
|
|
<div class="col">
|
|
|
|
<div class="col">
|
|
|
|
<input class="form-check-input" type="checkbox" id="f1"
|
|
|
|
<input class="form-check-input" type="checkbox" id="f1"
|
|
|
@ -130,17 +127,21 @@
|
|
|
|
value="Применить фильтр"/>
|
|
|
|
value="Применить фильтр"/>
|
|
|
|
<hr/>
|
|
|
|
<hr/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<div class="form-group">
|
|
|
|
<div class="form-group">
|
|
|
|
<label>Руководитель проекта:</label>
|
|
|
|
<label>Руководитель проекта:</label>
|
|
|
|
<select class="form-control" th:field="*{leaderId}" id="leader"
|
|
|
|
<select class="form-control" th:field="*{leaderId}" id="leaderId"
|
|
|
|
onchange="updateAuthors();">
|
|
|
|
onchange="updateAuthors();">
|
|
|
|
|
|
|
|
<option selected="selected" hidden="hidden" th:value="-1">-- Выберите
|
|
|
|
|
|
|
|
руководителя --
|
|
|
|
|
|
|
|
</option>
|
|
|
|
<option th:each="leader : ${allAuthors}" th:value="${leader.id}"
|
|
|
|
<option th:each="leader : ${allAuthors}" th:value="${leader.id}"
|
|
|
|
th:text="${leader.lastName}"> Руководитель
|
|
|
|
th:text="${leader.lastName}"> Руководитель
|
|
|
|
</option>
|
|
|
|
</option>
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
|
|
|
|
<p th:if="${#fields.hasErrors('leaderId')}" th:errors="*{leaderId}"
|
|
|
|
|
|
|
|
class="alert alert-danger">Choose leader</p>
|
|
|
|
|
|
|
|
<p class="help-block text-danger"></p>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<div class="form-group">
|
|
|
|
<div class="form-group">
|
|
|
|
<label>Участники гранта:</label>
|
|
|
|
<label>Участники гранта:</label>
|
|
|
|
<select class="selectpicker form-control" multiple="true"
|
|
|
|
<select class="selectpicker form-control" multiple="true"
|
|
|
@ -150,17 +151,13 @@
|
|
|
|
th:text="${author.lastName}"> Участник
|
|
|
|
th:text="${author.lastName}"> Участник
|
|
|
|
</option>
|
|
|
|
</option>
|
|
|
|
</select>
|
|
|
|
</select>
|
|
|
|
<p th:if="${#fields.hasErrors('authorIds')}" th:errors="*{authorIds}"
|
|
|
|
|
|
|
|
class="alert alert-danger">Incorrect member</p>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<div class="form-group">
|
|
|
|
<div class="form-group">
|
|
|
|
<label>Список статей:</label>
|
|
|
|
<label>Список статей:</label>
|
|
|
|
<p><a href="./#" class="btn btn-primary"><i class="fa fa-plus-circle"
|
|
|
|
<p><a href="./#" class="btn btn-primary"><i class="fa fa-plus-circle"
|
|
|
|
aria-hidden="true">
|
|
|
|
aria-hidden="true">
|
|
|
|
</i> Добавить статью</a></p>
|
|
|
|
</i> Добавить статью</a></p>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<div class="form-group">
|
|
|
|
<div class="form-group">
|
|
|
|
<div th:if="*{project} == null">
|
|
|
|
<div th:if="*{project} == null">
|
|
|
|
<input type="submit" name="createProject" class="btn btn-primary"
|
|
|
|
<input type="submit" name="createProject" class="btn btn-primary"
|
|
|
@ -169,7 +166,6 @@
|
|
|
|
<input type = "hidden" th:field="*{project.id}"/>
|
|
|
|
<input type = "hidden" th:field="*{project.id}"/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
<div class="clearfix"></div>
|
|
|
|
<div class="clearfix"></div>
|
|
|
|
<div class="col-lg-12">
|
|
|
|
<div class="col-lg-12">
|
|
|
|
<div class="form-group">
|
|
|
|
<div class="form-group">
|
|
|
@ -212,10 +208,8 @@
|
|
|
|
$("#authors").val('default');
|
|
|
|
$("#authors").val('default');
|
|
|
|
$("#authors").selectpicker("refresh");
|
|
|
|
$("#authors").selectpicker("refresh");
|
|
|
|
$("#authors").children('option:disabled').prop('disabled', false);
|
|
|
|
$("#authors").children('option:disabled').prop('disabled', false);
|
|
|
|
|
|
|
|
var lid = $("#leaderId option:selected").val();
|
|
|
|
var lid = document.getElementById("leader");
|
|
|
|
$("#authors [value='" + lid + "']").attr("disabled", "disabled");
|
|
|
|
var aut = document.getElementById("authors");
|
|
|
|
|
|
|
|
aut.options[lid.selectedIndex].disabled="disabled";
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
</script>
|
|
|
|
</script>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|