#58 added delete confirm
This commit is contained in:
parent
0cc8de2d32
commit
909c657c89
@ -66,8 +66,9 @@ public class ConferenceService {
|
||||
|
||||
@Transactional
|
||||
public void delete(Integer conferenceId) {
|
||||
// Conference conference = conferenceRepository.findOne(conferenceId);
|
||||
conferenceRepository.delete(conferenceId);
|
||||
if (conferenceRepository.exists(conferenceId)) {
|
||||
conferenceRepository.delete(conferenceId);
|
||||
}
|
||||
}
|
||||
|
||||
public void removeDeadline(ConferenceDto conferenceDto, Integer deadlineIndex) throws IOException {
|
||||
|
@ -2,6 +2,11 @@ body {
|
||||
min-width: 400px;
|
||||
}
|
||||
|
||||
.conference-row .col:hover {
|
||||
background-color: #eaeaea;
|
||||
border-radius: .25rem;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -1,27 +1,41 @@
|
||||
$(document).ready(function () {
|
||||
|
||||
$('.data-href-js').click( function() {
|
||||
window.location = $(this).attr('data-href');
|
||||
$(".conference-row").mouseenter(function (event) {
|
||||
var conferenceRow = $(event.target).closest(".conference-row");
|
||||
$(conferenceRow).css("background-color", "#f8f9fa");
|
||||
$(conferenceRow).find(".remove-conference").removeClass("d-none");
|
||||
|
||||
});
|
||||
$(".conference-row").mouseleave(function (event) {
|
||||
var conferenceRow = $(event.target).closest(".conference-row");
|
||||
$(conferenceRow).css("background-color", "white");
|
||||
$(conferenceRow).closest(".conference-row").find(".remove-conference").addClass("d-none");
|
||||
});
|
||||
|
||||
$('.circle').parent().click( function() {
|
||||
$(this).children('.circle').toggleClass('circle-active');
|
||||
});
|
||||
$('a[data-confirm]').click(function(ev) {
|
||||
var href = $(this).attr('href');
|
||||
if (!$('#dataConfirmModal').length) {
|
||||
$('#modalDelete').append('<div class="modal fade" id="dataConfirmModal" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true"\n' +
|
||||
' >\n' +
|
||||
' <div class="modal-dialog modal-sm">\n' +
|
||||
' <div class="modal-content">\n' +
|
||||
' <div class="modal-header">\n' +
|
||||
' <h8 class="modal-title" id="myModalLabel">Удалить конференцию?</h8>\n' +
|
||||
' <button type="button" class="close" data-dismiss="modal" aria-label="Закрыть"><span\n' +
|
||||
' aria-hidden="true">×</span></button>\n' +
|
||||
' </div>\n' +
|
||||
|
||||
$('.checkbox-js').parent().click( function() {
|
||||
$(this).children('.checkbox').toggleClass('selected');
|
||||
});
|
||||
|
||||
$('#select-all-js').click( function() {
|
||||
$(this).toggleClass('selected');
|
||||
|
||||
var childNodes = $('.conference-item .form-check .checkbox')
|
||||
.each(function(i, elem) {
|
||||
if ($(this).hasClass('selected') && !$('#select-all-js').hasClass('selected')) {
|
||||
$(this).toggleClass('selected');
|
||||
} else if (!$(this).hasClass('selected') && $('#select-all-js').hasClass('selected')){
|
||||
$(this).toggleClass('selected');
|
||||
}
|
||||
});
|
||||
' <div class="modal-footer">\n' +
|
||||
' <a class="btn btn-primary" id="dataConfirmOK">Да</a>'+
|
||||
' <button class="btn primary" data-dismiss="modal" aria-hidden="true">Нет</button>'+
|
||||
' </div>\n' +
|
||||
' </div>\n' +
|
||||
' </div>\n' +
|
||||
' </div>');
|
||||
}
|
||||
$('#dataConfirmModal').find('#myModalLabel').text($(this).attr('data-confirm'));
|
||||
$('#dataConfirmOK').attr('href', href);
|
||||
$('#dataConfirmModal').modal({show:true});
|
||||
return false;
|
||||
});
|
||||
});
|
||||
|
@ -3,6 +3,7 @@
|
||||
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||
layout:decorator="default" xmlns:th="">
|
||||
<head>
|
||||
<link rel="stylesheet" type="text/css" href="../css/conference.css"/>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -46,7 +47,7 @@
|
||||
|
||||
<div id="modalDelete"/>
|
||||
</form>
|
||||
<script></script>
|
||||
<script src="../js/conference.js"></script>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user