blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 16:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

added Parking feauture to infocenter

Browse Source
This commit is contained in:
alex
2018-05-16 20:00:19 +02:00
parent 24d4c316e4
commit 6a67183738
8 changed files with 400 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/infocenter/infocenterDetails.js
+138 -10
View File
@@ -20,6 +20,7 @@ function getUrlParameter(sParam)
}
var fhc_controller_id = getUrlParameter("fhc_controller_id");
const CONTROLLER_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/"+FHC_JS_DATA_STORAGE_OBJECT.called_path;
/**
* javascript file for infocenterDetails page
@@ -42,6 +43,8 @@ $(document).ready(
"dateFormat": "dd.mm.yy"
});
var personid = $("#hiddenpersonid").val();
//add submit event to message send link
$("#sendmsglink").click(
function ()
@@ -54,7 +57,6 @@ $(document).ready(
$(".prchbox").click(function ()
{
var boxid = this.id;
var personid = $("#hiddenpersonid").val();
var akteid = boxid.substr(boxid.indexOf("_") + 1);
var checked = this.checked;
saveFormalGeprueft(personid, akteid, checked)
@@ -64,7 +66,6 @@ $(document).ready(
$(".zgvUebernehmen").click(function ()
{
var btn = $(this);
var personid = $("#hiddenpersonid").val();
var prestudentid = this.id.substr(this.id.indexOf("_") + 1);
$('#zgvUebernehmenNotice').remove();
zgvUebernehmen(personid, prestudentid, btn)
@@ -118,11 +119,11 @@ $(document).ready(
if (notizId !== '')
{
updateNotiz(notizId, personId, data);
updateNotiz(notizId, personid, data);
}
else
{
saveNotiz(personId, data);
saveNotiz(personid, data);
}
}
);
@@ -150,6 +151,9 @@ $(document).ready(
}
);
//check if person is parked and display it
getParkedDateAjax(personid);
});
function openZgvInfoForPrestudent(prestudent_id)
@@ -169,7 +173,7 @@ function saveFormalGeprueft(personid, akteid, checked)
$.ajax({
type: "POST",
dataType: "json",
url: "../saveFormalGeprueft/" + personid + '?fhc_controller_id=' + fhc_controller_id,
url: CONTROLLER_URL+"/saveFormalGeprueft/" + personid + '?fhc_controller_id=' + fhc_controller_id,
data: {"akte_id": akteid, "formal_geprueft": checked},
success: function (data, textStatus, jqXHR)
{
@@ -197,9 +201,9 @@ function saveFormalGeprueft(personid, akteid, checked)
function zgvUebernehmen(personid, prestudentid, btn)
{
$.ajax({
type: "POST",
type: "GET",
dataType: "json",
url: "../getLastPrestudentWithZgvJson/" + personid + '?fhc_controller_id=' + fhc_controller_id,
url: CONTROLLER_URL+"/getLastPrestudentWithZgvJson/" + personid + '?fhc_controller_id=' + fhc_controller_id,
success: function (data, textStatus, jqXHR)
{
if (data !== null)
@@ -239,7 +243,7 @@ function saveZgv(data)
type: "POST",
dataType: "json",
data: data,
url: "../saveZgvPruefung/" + prestudentid + '?fhc_controller_id=' + fhc_controller_id,
url: CONTROLLER_URL+"/saveZgvPruefung/" + prestudentid + '?fhc_controller_id=' + fhc_controller_id,
success: function (data, textStatus, jqXHR)
{
if (data === prestudentid)
@@ -265,7 +269,7 @@ function saveNotiz(personid, data)
type: "POST",
dataType: "json",
data: data,
url: "../saveNotiz/" + personid + '?fhc_controller_id=' + fhc_controller_id,
url: CONTROLLER_URL+"/saveNotiz/" + personid + '?fhc_controller_id=' + fhc_controller_id,
success: function (data, textStatus, jqXHR)
{
refreshNotizen();
@@ -284,7 +288,7 @@ function updateNotiz(notizId, personId, data)
type: "POST",
dataType: "json",
data: data,
url: "../updateNotiz/" + notizId + "/" + personId + '?fhc_controller_id=' + fhc_controller_id,
url: CONTROLLER_URL+"/updateNotiz/" + notizId + "/" + personId + '?fhc_controller_id=' + fhc_controller_id,
success: function (data, textStatus, jqXHR)
{
if (data)
@@ -301,6 +305,86 @@ function updateNotiz(notizId, personId, data)
});
}
function getStudienjahrEndAjax()
{
$.ajax({
url: CONTROLLER_URL+"/getStudienjahrEnd?fhc_controller_id="+getUrlParameter("fhc_controller_id"),
method: "GET",
success: function(data, textStatus, jqXHR)
{
console.log(data);
//var gerdate = data.substring(8, 10) + "."+data.substring(5, 7) + "." + data.substring(0, 4);
var engdate = $.datepicker.parseDate("yy-mm-dd", data);
var gerdate = $.datepicker.formatDate("dd.mm.yy", engdate);
$("#parkdate").val(gerdate);
},
error: function (jqXHR, textStatus, errorThrown)
{
alert(textStatus);
}
});
}
function getParkedDateAjax(personid)
{
$.ajax({
url: CONTROLLER_URL+"/getParkedDate/"+personid+"?fhc_controller_id="+getUrlParameter("fhc_controller_id"),
method: "GET",
success: function(data, textStatus, jqXHR)
{
console.log(data);
refreshParking(data);
refreshLog();
getStudienjahrEndAjax();
},
error: function (jqXHR, textStatus, errorThrown)
{
alert(textStatus);
}
});
}
function parkPersonAjax(personid, date)
{
$.ajax({
url: CONTROLLER_URL+"/park?fhc_controller_id="+getUrlParameter("fhc_controller_id"),
method: "POST",
data:
{
"person_id": personid,
"parkdate": date
},
success: function(data, textStatus, jqXHR)
{
getParkedDateAjax(personid);
},
error: function (jqXHR, textStatus, errorThrown)
{
alert(textStatus);
}
});
}
function unparkPersonAjax(personid)
{
$.ajax({
url: CONTROLLER_URL+"/unpark?fhc_controller_id="+getUrlParameter("fhc_controller_id"),
method: "POST",
data:
{
"person_id": personid
},
success: function(data, textStatus, jqXHR)
{
getParkedDateAjax(personid);
},
error: function (jqXHR, textStatus, errorThrown)
{
alert(textStatus);
}
});
}
// -----------------------------------------------------------------------------------------------------------------
// methods executed after ajax (refreshers)
@@ -336,6 +420,50 @@ function refreshNotizen()
);
}
function refreshParking(date)
{
if (date === null)
{
$("#parking").html(
'<div class="form-group form-inline">'+
'<button class="btn btn-default" id="parklink" type="button""><i class="fa fa-clock-o"></i>&nbsp;BewerberIn parken</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+
'bis&nbsp;&nbsp;'+
'<input id="parkdate" type="text" class="form-control" placeholder="Parkdatum" style="height: 25px; width: 99px">'+
'</div>');
$("#parkdate").datepicker({
"dateFormat": "dd.mm.yy",
"minDate": 0
});
$("#parklink").click(
function ()
{
var personid = $("#hiddenpersonid").val();
var date = $("#parkdate").val();
parkPersonAjax(personid, date);
}
);
}
else
{
var parkdate = $.datepicker.parseDate("yy-mm-dd", date);
var gerparkdate = $.datepicker.formatDate("dd.mm.yy", parkdate);
$("#parking").html(
'BewerberIn geparkt bis '+gerparkdate+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+
'<button class="btn btn-default" id="unparklink"><i class="fa fa-sign-out"></i>&nbsp;BewerberIn ausparken</button>&nbsp;');
$("#unparklink").click(
function ()
{
var personid = $("#hiddenpersonid").val();
unparkPersonAjax(personid, date);
}
);
}
}
function formatNotizTable()
{
addTablesorter("notiztable", [[0, 1]], ["filter"], 2);
public/js/infocenter/infocenterPersonDataset.js
+10 -4
View File
@@ -25,10 +25,13 @@ function appendTableActionsHtml()
'<a href="javascript:void(0)" class="unselectAll">' +
'<i class="fa fa-times"></i>&nbsp;Keinen</a>&nbsp;&nbsp;&nbsp;&nbsp;';
var messageHtml = 'Mit Ausgew&auml;hlten:&nbsp;&nbsp;' +
var actionHtml = 'Mit Ausgew&auml;hlten:&nbsp;&nbsp;' +
'<a href="javascript:void(0)" class="sendMsgsLink">' +
'<i class="fa fa-envelope"></i>&nbsp;Nachricht senden</a>';
var legendHtml = '<i class="fa fa-circle text-danger"></i> Gesperrt&nbsp;&nbsp;&nbsp;&nbsp;' +
'<i class="fa fa-circle text-info"></i> Geparkt';
var personcount = 0;
$.ajax({
@@ -51,9 +54,12 @@ function appendTableActionsHtml()
var countHtml = personcount + " " + persontext;
$("#datasetActionsTop, #datasetActionsBottom").append(
"<div class='pull-left'>" + selectAllHtml + "&nbsp;&nbsp;" + messageHtml + "</div>"+
"<div class='pull-right'>" + countHtml + "</div>"+
"<div class='clearfix'></div>"
"<div class='row'>"+
"<div class='col-xs-4'>" + selectAllHtml + "&nbsp;&nbsp;" + actionHtml + "</div>"+
"<div class='col-xs-4 text-center'>" + legendHtml + "</div>"+
"<div class='col-xs-4 text-right'>" + countHtml + "</div>"+
"<div class='clearfix'></div>"+
"</div>"
);
$("#datasetActionsBottom").append("<br><br>");
}