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

5
Praktikum2/ppm2/app/eval.py
View File

@ -49,11 +49,6 @@ class Eval(object):
data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['Lehrender'] = ''
data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['ZeitraumVon'] = valueAngebote['ZeitraumVon']
data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']]['ZeitraumBis'] = valueAngebote['ZeitraumBis']
<<<<<<< HEAD
=======
print(data)
return self.view.CreateListEval(data)
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
elif(cat == 'Studenten'):
for keyStudent, valueStudent in Studenten.items():
data[valueStudent['Name']] = {}

14
Praktikum2/ppm2/data/Angebote/27.json
View File

@ -1,5 +1,4 @@
{
<<<<<<< HEAD
"ZeitraumBis": "02.02.2003",
"Firma": "Apple",
"ZeitraumVon": "02.02.2002",
@ -11,17 +10,4 @@
"Firmenbetreuer": "Horst",
"Voraussetzungen": "Keine",
"Name": "Angebot Apple 2"
=======
"Lehrender": "5",
"Status": "abgeschlossen",
"Firmenbetreuer": "Horst",
"Firma": "Apple",
"Name": "Angebot Apple 2",
"Beschreibung": "Praxisphase Apple",
"Student": "11",
"Voraussetzungen": "Keine",
"ZeitraumBis": "02.02.2003",
"id": "27",
"ZeitraumVon": "02.02.2002"
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
}

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
});

11
Praktikum2/ppm2/templates/index.tpl
View File

@ -1,7 +1,3 @@
<<<<<<< HEAD
=======
<div id="idContent" class="clContent">
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
<h2 id="idContentHeader" class="clContentHeader">Module</h2>
<div class="clContentArea">
<ul class="clMenu" id="clMenu">
@ -13,9 +9,4 @@
<li><a class="clNavButton" data-action="evalLehrender">Auswertung: Lehrenden</a></li>
<li><a class="clNavButton" data-action="evalFirmen">Auswertung: Firmen</a></li>
</ul>
<<<<<<< HEAD
</div>
=======
</div>
</div>
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
</div>

21
Praktikum2/ppm2/templates/list.tpl
View File

@ -1,7 +1,3 @@
<<<<<<< HEAD
=======
<div id="idContent" class="clContent">
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
<h2 id="idContentHeader" class="clContentHeader">
&Uumlbersicht: #context['category']#
</h2>
@ -40,7 +36,6 @@
@endif@
</tr id=#entries#>
@endfor@
<<<<<<< HEAD
@endif@
</table>
@ -49,18 +44,4 @@
<a class="clButton" data-action="New#context['category']#">Neu</a>
<a class="clButton" data-action="Modify#context['category']#">Bearbeiten</a>
<a class="clButton" data-action="Delete#context['category']#">Loeschen</a>
</div>
=======
@endif
</table>
</div>
<div id="idButtonArea" class="clButtonArea">
<a href="/index" class="clButton">Startseite</a>
<a class="clButton" id="New">Neu</a>
<a class="clButton" id="Modify">Bearbeiten</a>
<a class="clButton" id="Delete">Loeschen</a>
</div>
</div>
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
</div>

13
Praktikum2/ppm2/templates/listChoice.tpl
View File

@ -1,7 +1,3 @@
<<<<<<< HEAD
=======
<div id="idContent" class="clContent">
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
<h2 id="idContentHeader" class="clContentHeader">
&Uumlbersicht Praxisphasen Auswahl
</h2>
@ -32,13 +28,6 @@
</div>
<div id="idButtonArea" class="clButtonArea">
<<<<<<< HEAD
<a class="clButton" data-action="index">Startseite</a>
<a class="clButton" id="Annehmen">Annehmen</a>
</div>
=======
<a data-action="index" class="clButton">Startseite</a>
<a class="clButton" id="Annehmen">Annehmen</a>
</div>
</div>
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
</div>

16
Praktikum2/ppm2/templates/listEval.tpl
View File

@ -1,17 +1,9 @@
<<<<<<< HEAD
=======
<div id="idContent" class="clContent">
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
<h2 id="idContentHeader" class="clContentHeader">
&Uumlbersicht: #context['category']#
</h2>
<div id="idContentArea" class="clContentArea">
@if context['category'] == 'Firmen'@
<<<<<<< HEAD
@for firmen in context@
=======
@for firmen in category@
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
@if firmen != 'category'@
<h3>#firmen#</h3>
<table id="idList">
@ -125,11 +117,5 @@
</div>
<div id="idButtonArea" class="clButtonArea">
<<<<<<< HEAD
<a class="clButton" data-action="index">Startseite</a>
</div>
=======
<a data-action="index" class="clButton">Startseite</a>
</div>
</div>
>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
</div>