Sweetalert2 Hozzáadva.
This commit is contained in:
parent
c893f92d9f
commit
1591fc9b5d
|
|
@ -57,6 +57,7 @@
|
||||||
"pizzip": "^3.1.3",
|
"pizzip": "^3.1.3",
|
||||||
"pug": "^3.0.2",
|
"pug": "^3.0.2",
|
||||||
"semantic-ui-table": "^2.3.1",
|
"semantic-ui-table": "^2.3.1",
|
||||||
|
"sweetalert2": "^11.14.2",
|
||||||
"util": "^0.10.4",
|
"util": "^0.10.4",
|
||||||
"uuid": "^3.4.0",
|
"uuid": "^3.4.0",
|
||||||
"uuid-apikey": "^1.5.1",
|
"uuid-apikey": "^1.5.1",
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ block content
|
||||||
- function datesDiff(s,e) { var a=moment(e,'DD-MM-YYYY');var b=moment(s,'DD-MM-YYYY'); return a.diff(b,'days'); };
|
- function datesDiff(s,e) { var a=moment(e,'DD-MM-YYYY');var b=moment(s,'DD-MM-YYYY'); return a.diff(b,'days'); };
|
||||||
link(rel='stylesheet', href='https://use.fontawesome.com/releases/v5.6.1/css/all.css', integrity='sha384-gfdkjb5BdAXd+lj+gudLWI+BXq4IuLW5IT+brZEZsLFm++aCMlF1V92rMkPaX4PP', crossorigin='anonymous')
|
link(rel='stylesheet', href='https://use.fontawesome.com/releases/v5.6.1/css/all.css', integrity='sha384-gfdkjb5BdAXd+lj+gudLWI+BXq4IuLW5IT+brZEZsLFm++aCMlF1V92rMkPaX4PP', crossorigin='anonymous')
|
||||||
link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest/css/lightpick.css')
|
link(rel='stylesheet', type='text/css', href='https://unpkg.com/lightpick@latest/css/lightpick.css')
|
||||||
|
link(rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/11.14.2/sweetalert2.css" integrity="sha512-TG239kA30BXeGpy+HpJei+qfJcKo8V9HKpe8UWuVdpk49NGUe86EDhmdXkCxMqD5gSlkLLi6YQ9SbNp+yRa9xQ==" crossorigin="anonymous" referrerpolicy="no-referrer")
|
||||||
style(type="text/css").
|
style(type="text/css").
|
||||||
.mx {
|
.mx {
|
||||||
margin: 0 5px;
|
margin: 0 5px;
|
||||||
|
|
@ -69,7 +70,8 @@ block content
|
||||||
script(src='/bower_components/moment/min/moment-with-locales.js')
|
script(src='/bower_components/moment/min/moment-with-locales.js')
|
||||||
script(type='text/javascript', src='/bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js')
|
script(type='text/javascript', src='/bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js')
|
||||||
script(src='https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js')
|
script(src='https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js')
|
||||||
script(src='https://unpkg.com/lightpick@latest/lightpick.js')
|
script(src='https://unpkg.com/lightpick@latest/lightpick.js')
|
||||||
|
script(src="https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/11.14.2/sweetalert2.min.js" integrity="sha512-nD7/PXl2UD6bAYMJVKTLhr7qwnWVvoyqk8/WMzedDKMiQbaNXT3EUPzLYbLUHCLWqAZoXO37aVCtCKmAxZfqGw==" crossorigin="anonymous" referrerpolicy="no-referrer")
|
||||||
script(src='/js/workingtime.js')
|
script(src='/js/workingtime.js')
|
||||||
script.
|
script.
|
||||||
//Szabadság törlése
|
//Szabadság törlése
|
||||||
|
|
@ -153,67 +155,119 @@ block content
|
||||||
var calendarEl = document.getElementById('calendar');
|
var calendarEl = document.getElementById('calendar');
|
||||||
var empId = document.getElementById('uid')
|
var empId = document.getElementById('uid')
|
||||||
const year=+moment().format("YYYY")
|
const year=+moment().format("YYYY")
|
||||||
var calendar = new FullCalendar.Calendar(calendarEl, {
|
var calendar = new FullCalendar.Calendar(calendarEl,
|
||||||
initialView: 'multiMonthFourMonth',
|
{
|
||||||
locale: 'hu',
|
initialView: 'multiMonthFourMonth',
|
||||||
firstDay: 1,
|
locale: 'hu',
|
||||||
initialDate: '2024-01-01',
|
firstDay: 1,
|
||||||
height: 'auto',
|
initialDate: '2024-01-01',
|
||||||
//eventLimit: true,
|
height: 'auto',
|
||||||
eventOrder: '-order',
|
//eventLimit: true,
|
||||||
showNonCurrentDates:false,
|
eventOrder: '-order',
|
||||||
//dayMaxEvents: 10,
|
showNonCurrentDates:false,
|
||||||
//dayMaxEventRows: 10,
|
//dayMaxEvents: 10,
|
||||||
nextDayThreshold: "01:00:00",
|
//dayMaxEventRows: 10,
|
||||||
displayEventTime: false,
|
nextDayThreshold: "01:00:00",
|
||||||
editable: true,
|
displayEventTime: false,
|
||||||
eventStartEditable:true,
|
editable: true,
|
||||||
eventDurationEditable:true,
|
eventStartEditable:true,
|
||||||
views: {
|
eventDurationEditable:true,
|
||||||
multiMonthFourMonth: {
|
views: {
|
||||||
type: 'multiMonth',
|
multiMonthFourMonth: {
|
||||||
duration: { months: 12 },
|
type: 'multiMonth',
|
||||||
multiMonthMaxColumns: 2,
|
duration: { months: 12 },
|
||||||
eventLimit: 10,
|
multiMonthMaxColumns: 2,
|
||||||
}
|
eventLimit: 10,
|
||||||
},
|
}
|
||||||
|
},
|
||||||
//initialEvents: res,
|
//initialEvents: res,
|
||||||
//events: '/employee/holidays_byperson_calendar/'+empId.textContent+'/'+year,
|
//events: '/employee/holidays_byperson_calendar/'+empId.textContent+'/'+year,
|
||||||
weekNumbers: true,
|
weekNumbers: true,
|
||||||
themeSystem: 'default',
|
themeSystem: 'default',
|
||||||
eventClick: function(info) {
|
eventClick: function(info)
|
||||||
//alert('Event: ' + info.event.title+'\n'+info.event.id+'\n'+info.event.extendedProps.employeeId);
|
{
|
||||||
console.log('Event: ' + info.event.title+'\n'+info.event.id+'\n'+info.event.extendedProps.employeeId)
|
//alert('Event: ' + info.event.title+'\n'+info.event.id+'\n'+info.event.extendedProps.employeeId);
|
||||||
|
console.log('Event: ' + info.event.title+'\n'+info.event.id+'\n'+info.event.extendedProps.employeeId)
|
||||||
|
|
||||||
// change the border color just for fun
|
// change the border color just for fun
|
||||||
info.el.style.borderColor = 'red';
|
info.el.style.borderColor = 'red';
|
||||||
},
|
},
|
||||||
eventDrop: async function( eventDropInfo ) {
|
eventDrop: async function( eventDropInfo )
|
||||||
if (!confirm("Biztosan végrehajtja a módosítást?\n\nA változásról "+eventDropInfo.event.title+" e-mail értesítést fog kapni."))
|
{
|
||||||
{
|
const result= await Swal.fire(
|
||||||
eventDropInfo.revert();
|
{
|
||||||
}
|
title: "Biztosan végrehajtja a módosítást?",
|
||||||
else
|
text: "A változásról "+eventDropInfo.event.title+" e-mail értesítést fog kapni.",
|
||||||
{
|
icon: "question",
|
||||||
console.log("Event ID: "+eventDropInfo.event.id)
|
showDenyButton: true,
|
||||||
console.log("Event Before Drop\n"+eventDropInfo.oldEvent.start+'-'+eventDropInfo.oldEvent.end)
|
//showCancelButton: true,
|
||||||
console.log("Event After Drop\n"+eventDropInfo.event.start+'-'+eventDropInfo.event.end)
|
confirmButtonText: 'Igen',
|
||||||
const response = await fetch("/employee/holiday_update", {
|
denyButtonText: 'Nem',
|
||||||
headers: {
|
customClass: {
|
||||||
"Content-Type": "application/json",
|
actions: 'my-actions',
|
||||||
},
|
//cancelButton: 'order-1 right-gap',
|
||||||
method: "POST",
|
confirmButton: 'order-2',
|
||||||
body: JSON.stringify({ event: eventDropInfo.event }),
|
denyButton: 'order-3',
|
||||||
});
|
},
|
||||||
if (!response.ok) {
|
}
|
||||||
//throw new Error(`HTTP error! Status: ${response.status}`);
|
);//.then((result) => {
|
||||||
alert(`HTTP error! Status: ${response.status}`)
|
if (result.isConfirmed)
|
||||||
}
|
{
|
||||||
if (response.response="OK")
|
console.log("Event ID: "+eventDropInfo.event.id)
|
||||||
|
console.log("Event Before Drop\n"+eventDropInfo.oldEvent.start+'-'+eventDropInfo.oldEvent.end)
|
||||||
|
console.log("Event After Drop\n"+eventDropInfo.event.start+'-'+eventDropInfo.event.end)
|
||||||
|
const response = await fetch("/employee/holiday_update",
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify({ event: eventDropInfo.event }),
|
||||||
|
});
|
||||||
|
if (!response.ok)
|
||||||
|
{
|
||||||
|
//throw new Error(`HTTP error! Status: ${response.status}`);
|
||||||
|
//alert(`HTTP error! Status: ${response.status}`)
|
||||||
|
Swal.fire('Error', '', 'error')
|
||||||
|
}
|
||||||
|
if (response.response="OK")
|
||||||
|
{
|
||||||
|
Swal.fire('Saved!', '', 'success')
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if (result.isDenied)
|
||||||
|
{
|
||||||
|
//Swal.fire('Changes are not saved', '', 'info')
|
||||||
|
eventDropInfo.revert();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* if (!confirm("Biztosan végrehajtja a módosítást?\n\nA változásról "+eventDropInfo.event.title+" e-mail értesítést fog kapni."))
|
||||||
{
|
{
|
||||||
alert("Sikeres Módosítás!")
|
eventDropInfo.revert();
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
|
{
|
||||||
|
console.log("Event ID: "+eventDropInfo.event.id)
|
||||||
|
console.log("Event Before Drop\n"+eventDropInfo.oldEvent.start+'-'+eventDropInfo.oldEvent.end)
|
||||||
|
console.log("Event After Drop\n"+eventDropInfo.event.start+'-'+eventDropInfo.event.end)
|
||||||
|
const response = await fetch("/employee/holiday_update", {
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify({ event: eventDropInfo.event }),
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
//throw new Error(`HTTP error! Status: ${response.status}`);
|
||||||
|
alert(`HTTP error! Status: ${response.status}`)
|
||||||
|
}
|
||||||
|
if (response.response="OK")
|
||||||
|
{
|
||||||
|
alert("Sikeres Módosítás!")
|
||||||
|
}
|
||||||
|
}*/
|
||||||
},
|
},
|
||||||
eventResize:function( eventResizeInfo ) {
|
eventResize:function( eventResizeInfo ) {
|
||||||
if (!confirm("Biztosan végrehajtja a módosítást?\n\nA változásról "+eventResizeInfo.event.title+" e-mail értesítést fog kapni."))
|
if (!confirm("Biztosan végrehajtja a módosítást?\n\nA változásról "+eventResizeInfo.event.title+" e-mail értesítést fog kapni."))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue