darthsandmann/WEB
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "PPM2: select"

Browse Source 
This reverts commit 552b7cc942
This commit is contained in:
darthsandmann
2016-12-12 23:04:04 +01:00
parent 552b7cc942
commit 8060d7af68
10 changed files with 5 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Praktikum2/ppm2/static/html/index.html
View File

@ -18,21 +18,6 @@
<a title="Zur&uumlck zur Startseite">Praxisphasenmanager (PPM)</a>
</h1>
<div id="idContent" class="clContent">
<<<<<<< HEAD
=======
<h2 id="idContentHeader" class="clContentHeader">Module</h2>
<div class="clContentArea">
<ul class="clMenu" id="clMenu">
<li><a class="clNavButton" data-action="categoryStudenten">Datenpflege: Studenten</a></li>
<li><a class="clNavButton" data-action="categoryLehrender">Datenpflege: Lehrender</a></li>
<li><a class="clNavButton" data-action="categoryFirmen">Datenpflege: Firmenverzeichnis</a></li>
<li><a class="clNavButton" data-action="choice">Auswahl: Praxisphasen</a></li>
<li><a class="clNavButton" data-action="evalStudenten">Auswertung: Studenten</a></li>
<li><a class="clNavButton" data-action="evalLehrender">Auswertung: Lehrenden</a></li>
<li><a class="clNavButton" data-action="evalFirmen">Auswertung: Firmen</a></li>
</ul>
</div>
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
</div>
</body>
<footer>

31
Praktikum2/ppm2/static/js/ppm.js
View File

@ -6,7 +6,6 @@ class PPM
{
constructor ()
{
<<<<<<< HEAD
this.BodyDataAction();
this.TemplateManager_o = new TemplateManager_cl();
@ -34,18 +33,11 @@ class PPM
console.log("SELECT ID: ", this.selectedId);
return false;
});
=======
this.TemplateManager_o = new TemplateManager_cl();
this.TemplateManager_o;
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
}
Menu (message)
{
<<<<<<< HEAD
var selectedId = $(".selected").attr('id');
=======
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
switch (message)
{
case 'index':
@ -88,7 +80,6 @@ class PPM
this.LoadContent('/eval/?cat=Firmen', 'listEval.tpl');
break
<<<<<<< HEAD
case 'NewStudenten':
console.log("NewStudenten");
@ -133,8 +124,6 @@ class PPM
console.log("DeleteFirmen", selectedId);
break
=======
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
default:
alert ('[PPM] Unbekannte Anfrage: ' + message);
@ -150,7 +139,6 @@ class PPM
context: this
})
.done(function (json) {
<<<<<<< HEAD
//console.log("JSON: ", json);
var result = this.TemplateManager_o.execute_px( template, json );
@ -161,15 +149,6 @@ class PPM
$( ".clContent" ).append(result);
this.BodyTableSelect();
console.log("TM DONE");
=======
console.log("JSON: ", json);
var result = this.TemplateManager_o.execute_px( template, json );
console.log("RESULT: ", result);
$( ".clContent" ).replaceWith(result);
console.log("DONE LOADING!");
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
})
.fail(function(jqXHR_opl, textStatus_spl) {
alert( "[PPM] Fehler bei Anforderung: " + textStatus_spl );
@ -177,19 +156,9 @@ class PPM
}
}
<<<<<<< HEAD
$(function() {
console.log("ONLOAD");
PPM_o = new PPM();
PPM_o.Menu("index");
=======
$(function() {
$('body').on('click', '[data-action]', function() {
var action = $(this).data('action');
this.PPM_o = new PPM();
this.PPM_o.Menu(action);
return false;
});
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
});