|
|
@@ -214,20 +214,19 @@ $(document).on('dblclick', '#sortable li', function(e) {
|
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
|
version="1.0.0"
|
|
|
service="WFS"
|
|
|
- xmlns:p5_default_db="` + BASE_URL + `wfs/default_db/PROBLEMS"
|
|
|
- xsi:schemaLocation="` + BASE_URL + `wfs/default_db/PROBLEMS` + BASE_URL + `dev-pl/se-feature-api/wfs.php/xml/wfs/default_db/PROBLEMS/?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=p5_default_db:PROBLEMS&SRSNAME=EPSG:4326&"
|
|
|
+ xmlns:p5_default_db="` + BASE_WFS_URL + `/default_db/"
|
|
|
xmlns:gml="http://www.opengis.net/gml">
|
|
|
`;
|
|
|
req += `
|
|
|
<Insert xmlns="http://www.opengis.net/wfs">
|
|
|
- <PROBLEMS xmlns="` + BASE_URL + `wfs/default_db/PROBLEMS">
|
|
|
- <ID xmlns="` + BASE_URL + `wfs/default_db/PROBLEMS">` + $(this).data("id") + `</ID>`;
|
|
|
+ <PROBLEMS xmlns="` + BASE_WFS_URL + `/default_db/">
|
|
|
+ <ID xmlns="` + BASE_WFS_URL + `/default_db/">` + $(this).data("id") + `</ID>`;
|
|
|
if (state[index]["status"] == "NORMAL") {
|
|
|
state[index]["status"] = "WAITING";
|
|
|
- req += '<A_STATUS xmlns="' + BASE_URL + 'wfs/default_db/PROBLEMS">WAITING</A_STATUS>';
|
|
|
+ req += '<A_STATUS xmlns="' + BASE_WFS_URL + '/default_db/">WAITING</A_STATUS>';
|
|
|
} else if (state[index]["status"] == "WAITING") {
|
|
|
state[index]["status"] = "NORMAL";
|
|
|
- req += '<A_STATUS xmlns="' + BASE_URL + 'wfs/default_db/PROBLEMS">NORMAL</A_STATUS>';
|
|
|
+ req += '<A_STATUS xmlns="' + BASE_WFS_URL + '/default_db/">NORMAL</A_STATUS>';
|
|
|
}
|
|
|
req += `</PROBLEMS>
|
|
|
</Insert>
|
|
|
@@ -822,27 +821,29 @@ function render() {
|
|
|
}
|
|
|
}
|
|
|
result += "<li class=singleTask data-id=" + e["id"] + " style='"+css+"'>";
|
|
|
- result += "<span class='glyphicon glyphicon-option-vertical ico'></span>";
|
|
|
+
|
|
|
if (e["percent"] == "100%") {
|
|
|
- result += "<span class=check style='background-color:#333333'></span>";
|
|
|
+ result += "<span class=check style='background-color:#333333' data-toggle='popover' data-trigger='hover' title='' data-content='Kliknij teraz, aby zmienić status na niewykonane.' data-original-title='Zadanie wykonane'></span>";
|
|
|
if (e['status'] != "OFF_HARD") {
|
|
|
- result += "<span class=aCheck></span>";
|
|
|
+ result += "<span class=aCheck data-toggle='popover' data-trigger='hover' title='' data-content='Wykonawca oznaczył zadanie jako wykonane, ale zleceniodawca jeszcze go nie zatwierdził.' data-original-title='Wykonanie zadania niezatwierdzone.'></span>";
|
|
|
} else {
|
|
|
- result += "<span class=aCheck style=background-color:#2ecc71;></span>";
|
|
|
+ result += "<span class=aCheck style=background-color:#2ecc71; data-toggle='popover' data-trigger='hover' title='' data-content='Zleceniodawca zatwierdził wykonanie zadania. Kliknij, aby cofnąć zatwierdzenie.' data-original-title='Zadanie zatwierdzone'></span>";
|
|
|
}
|
|
|
} else {
|
|
|
- result += "<span class=check></span>";
|
|
|
+ result += "<span class='glyphicon glyphicon-option-vertical ico cursorClick' style=float:left;cursor:grab; data-toggle='popover' data-trigger='hover' title='' data-content='Złap tutaj, aby zmienić pozycje tego zadania.' data-original-title='Sortowanie'></span>";
|
|
|
+ result += "<span class=check data-toggle='popover' data-trigger='hover' title='' data-content='Oznacz zadanie jako wykonane. Podwójne kliknięcie gdziekolwiek na zadanie spowoduje oznaczenie go jako aktualnie wykonywane.' data-original-title='Zadanie niewykonane'></span>";
|
|
|
}
|
|
|
- result += "<input type=text "+(e["childs"] ? "DISABLED" : "")+" class='form-control hours' value='"+e["period"]+"' style=width:40px;float:left;padding:0px;height:25px;>"
|
|
|
- result += "<textarea " + (USER != e["owner"] || e['status'] == "OFF_HARD" ? "DISABLED" : "") + ' class="editable" style="font-size:small">' + e['desc'] + "</textarea>";
|
|
|
+ result += "<input type=text "+(e["childs"] ? "DISABLED" : "")+" placeholder='czas' class='form-control hours' value='"+e["period"]+"' style=width:40px;float:left;padding:0px;height:25px; data-toggle='popover' data-trigger='hover' title='' data-content='Wpisz tutaj czas, który zostanie/został przeznaczony na to zadanie i zatwierdź ENTER. ' data-original-title='Czas przeznaczony na zadanie'>"
|
|
|
+
|
|
|
+ result += "<textarea " + (USER != e["owner"] || e['status'] == "OFF_HARD" ? "DISABLED" : "") + ' class="editable" style="font-size:small" >' + e['desc'] + "</textarea>";
|
|
|
result += `<div class="dropdown" style=display:inline;>
|
|
|
- <span class="glyphicon glyphicon glyphicon-menu-hamburger" style="vertical-align: top;" data-toggle="dropdown"></span>
|
|
|
+ <span class="glyphicon glyphicon glyphicon-menu-hamburger cursorClick" style="vertical-align: top;" data-toggle="dropdown"></span>
|
|
|
<ul class="dropdown-menu dropdown-menu-right">
|
|
|
<li><a href=` + BASE_URL + `index.php?_route=UrlAction_TaskManager&ID_PROBLEM=` + e['id'] + `>Szczegóły</a></li>
|
|
|
<li><p style="cursor:pointer;padding:3px 20px;" class=delTask>Usuń</p></li>
|
|
|
</ul>
|
|
|
</div>`;
|
|
|
- result += ((e['owner'] != USER) ? " <span class='glyphicon glyphicon-user user' title='Zlecone przez inną osobę'></span>" : "") + "</li>";
|
|
|
+ //result += ((e['owner'] != USER) ? " <span class='glyphicon glyphicon-user user' title='Zlecone przez inną osobę'></span>" : "") + "</li>";
|
|
|
if (e['percent'] == "100%") {
|
|
|
resultDone += result;
|
|
|
} else {
|
|
|
@@ -854,6 +855,7 @@ function render() {
|
|
|
$("#sortable").html(resultActive);
|
|
|
$("#doneList").html(resultDone);
|
|
|
$('.editable').autosize();
|
|
|
+ $('[data-toggle="popover"]').popover();
|
|
|
}
|
|
|
|
|
|
function loadStats(){
|
|
|
@@ -878,17 +880,17 @@ function renderTaskManager() {
|
|
|
loadStats();
|
|
|
}
|
|
|
$(".taskList").append("<div class=progress></div>");
|
|
|
- $(".progress").append("<div id=accepted class='progress-bar progress-bar-success progress-bar-striped' role=progressbar style=width:9%>0%</div>");
|
|
|
- $(".progress").append("<div id=completed class='progress-bar progress-bar-info progress-bar-striped' role=progressbar style=width:9%>0%</div>");
|
|
|
+ $(".progress").append("<div id=accepted class='progress-bar progress-bar-success progress-bar-striped' role=progressbar style=width:9% data-toggle='popover' data-trigger='hover' title='' data-content='Wskazuje na procent całości jakie stanowią zatwierdzone zadania.' data-html='true' data-original-title='% zatwierdzonych zadań' data-placement='bottom'>0%</div>");
|
|
|
+ $(".progress").append("<div id=completed class='progress-bar progress-bar-info progress-bar-striped' role=progressbar style=width:9% data-toggle='popover' data-trigger='hover' title='' data-content='Wskazuje na procent całości jakie stanowią wykonane zadania.' data-html='true' data-original-title='% wykonanych zadań' data-placement='bottom'>0%</div>");
|
|
|
$(".taskList").append("<ul id='sortable'></ul>");
|
|
|
|
|
|
// $("#sortable").append("<li><span class='glyphicon glyphicon-option-vertical ico'></span><span class=check data-step=0></span> <div class=editable contentEditable='true'>Zaprojektować podstawowy layout skryptu</div></li>");
|
|
|
// $("#sortable").append("<li><span class='glyphicon glyphicon-option-vertical ico'></span><span class=check data-step=0></span> <div class=editable contentEditable='true'>Stworzyć tasklistę, dodać przesuwaunie i flagowanie</div></li>");
|
|
|
// $("#sortable").append("<li><span class='glyphicon glyphicon-option-vertical ico'></span><span class=check data-step=0></span> <div class=editable contentEditable='true'>Dodać po lewej stronie formularz</div></li>");
|
|
|
// $("#sortable").append("<li><span class='glyphicon glyphicon-option-vertical ico'></span><span class=check data-step=0></span> <div class=editable contentEditable='true'>Połączyć z API</div></li>");
|
|
|
- $(".taskList").append('<div id="add" style="font-size:small">' +
|
|
|
- '<span class="glyphicon glyphicon-plus addIco" style="padding-top:3px"></span> ' +
|
|
|
- '<textarea class="eInput" style="font-size:small" id="datepicker" placeholder="Dodaj zadanie"></textarea>' +
|
|
|
+ $(".taskList").append('<div id="add" style="font-size:small;">' +
|
|
|
+ '<span class="glyphicon glyphicon-plus addIco" style="padding-top:3px;margin-left:65px;"></span> ' +
|
|
|
+ '<textarea class="eInput" style="font-size:small" data-toggle="popover" data-trigger="hover" title="" data-content="Wpisz treść i zatwierdź <b>ENTER</b>.<br> Użyj tagów:<br> @nazwauzytkownika -> wykonawca <br> @RRRR-MM-DD -> Termin wykonania <br> np. <br>`@janKowalski @2017-03-12 Nadać przesyłkę`" data-html="true" data-original-title="Dodaj zadanie" data-placement="top" id="datepicker" placeholder="Dodaj zadanie"></textarea>' +
|
|
|
'<div class="clearfix"></div>' + '</div>');
|
|
|
picker = $("<input/>", {
|
|
|
type: 'text',
|