Done
This commit is contained in:
parent
aa300044f6
commit
41af35a624
Binary file not shown.
Binary file not shown.
@ -18,9 +18,9 @@ class Category(object):
|
||||
#-------------------------------------------------------
|
||||
def GET(self, cat, view, id=None):
|
||||
#-------------------------------------------------------
|
||||
self.db.ReadAll()
|
||||
data = {}
|
||||
if(cat != "Index"):
|
||||
self.db.ReadAll()
|
||||
if(view == "List"):
|
||||
data['content'] = {}
|
||||
data['headings'] = {}
|
||||
|
@ -35,6 +35,7 @@ class Eval(object):
|
||||
data[valueFirma['Name']]['Angebote']['Angebot'] = {}
|
||||
data[valueFirma['Name']]['Angebote']['aktuell'] = {}
|
||||
data[valueFirma['Name']]['Angebote']['abgeschlossen'] = {}
|
||||
|
||||
for keyAngebote, valueAngebote in Angebote.items():
|
||||
if(valueAngebote['Firma'] == valueFirma['Name']):
|
||||
data[valueFirma['Name']]['Angebote'][valueAngebote['Status']][valueAngebote['Name']] = {}
|
||||
@ -49,6 +50,7 @@ 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']
|
||||
|
||||
elif(cat == 'Studenten'):
|
||||
for keyStudent, valueStudent in Studenten.items():
|
||||
data[valueStudent['Name']] = {}
|
||||
@ -82,4 +84,4 @@ class Eval(object):
|
||||
data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumVon'] = valueAngebot['ZeitraumVon']
|
||||
data[valueLehrende['Name']]['Angebote'][valueAngebot['Status']][keyAngebot]['ZeitraumBis'] = valueAngebot['ZeitraumBis']
|
||||
print(data)
|
||||
return json.dumps(data)
|
||||
return json.dumps(data)
|
@ -1,13 +1,13 @@
|
||||
{
|
||||
"ZeitraumBis": "02.02.2003",
|
||||
"Status": "abgeschlossen",
|
||||
"Name": "Angebot Apple 2",
|
||||
"ZeitraumVon": "02.02.2002",
|
||||
"Student": "11",
|
||||
"Lehrender": "5",
|
||||
"Firma": "Apple",
|
||||
"ZeitraumBis": "02.02.2003",
|
||||
"ZeitraumVon": "02.02.2002",
|
||||
"Beschreibung": "Praxisphase Apple",
|
||||
"Firmenbetreuer": "Horst",
|
||||
"Voraussetzungen": "Keine",
|
||||
"Student": "11",
|
||||
"id": "27",
|
||||
"Beschreibung": "Praxisphase Apple"
|
||||
"Lehrender": "5",
|
||||
"Name": "Angebot Apple 2",
|
||||
"Status": "abgeschlossen"
|
||||
}
|
@ -1,13 +1,13 @@
|
||||
{
|
||||
"ZeitraumBis": "2.2.2001",
|
||||
"Status": "abgeschlossen",
|
||||
"Name": "testa",
|
||||
"ZeitraumVon": "1.1.2000",
|
||||
"Student": "13",
|
||||
"Lehrender": "6",
|
||||
"Firma": "Apple",
|
||||
"ZeitraumBis": "2.2.2001",
|
||||
"ZeitraumVon": "1.1.2000",
|
||||
"Beschreibung": "testa",
|
||||
"Firmenbetreuer": "testa",
|
||||
"Voraussetzungen": "a",
|
||||
"Student": "13",
|
||||
"id": "28",
|
||||
"Beschreibung": "testa"
|
||||
"Lehrender": "6",
|
||||
"Name": "testa",
|
||||
"Status": "abgeschlossen"
|
||||
}
|
@ -1,13 +1,13 @@
|
||||
{
|
||||
"ZeitraumBis": "02.02.2000",
|
||||
"Status": "abgeschlossen",
|
||||
"Name": "name",
|
||||
"ZeitraumVon": "01.01.2000",
|
||||
"Student": "12",
|
||||
"Lehrender": "6",
|
||||
"Firma": "IBM",
|
||||
"ZeitraumBis": "02.02.2000",
|
||||
"ZeitraumVon": "01.01.2000",
|
||||
"Beschreibung": "beschreibung",
|
||||
"Firmenbetreuer": "firmenbetreuer",
|
||||
"Voraussetzungen": "voraussetzungen",
|
||||
"Student": "12",
|
||||
"id": "30",
|
||||
"Beschreibung": "beschreibung"
|
||||
"Lehrender": "6",
|
||||
"Name": "name",
|
||||
"Status": "abgeschlossen"
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"Vorname": "Alfons",
|
||||
"Name": "Meine",
|
||||
"Matrikelnummer": "4",
|
||||
"id": "12"
|
||||
"Matrikelnummer": "5",
|
||||
"id": "12",
|
||||
"Name": "Meine"
|
||||
}
|
@ -1,75 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>
|
||||
Praxisphasenmanager (PPM)
|
||||
</title>
|
||||
<meta charset="UTF-8" />
|
||||
<style type="text/css">
|
||||
@import url("/style.css");
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1 id="idSiteHeader" class="clSiteHeader">
|
||||
<a href="/index" title="Zurück zur Startseite">Praxisphasenmanager (PPM)</a>
|
||||
</h1>
|
||||
|
||||
<form id="idForm" class="clContent" action="/save/?cat=${data['category']}" method="POST">
|
||||
<h2 id="idContentHeader" class="clContentHeader">
|
||||
${data['category']}: Ihre Daten
|
||||
</h2>
|
||||
<div id="idContentArea" class="clContentArea">
|
||||
<input type="hidden" value="${data['id']}" id="id" name="id" />
|
||||
|
||||
% if data['category'] != 'Angebote':
|
||||
% for field in data['content']:
|
||||
% if field!='id' and field!='Status':
|
||||
<div class="clFormRow">
|
||||
<label for="${field}">${field}</label>
|
||||
<input type="text" value=
|
||||
% if data['content'][field] != field:
|
||||
"${data['content'][field]}" id="${field}" name="${field}" />
|
||||
% else:
|
||||
"" id="${field}" name="${field}" />
|
||||
% endif
|
||||
</div>
|
||||
% endif
|
||||
% endfor
|
||||
% else:
|
||||
<input type="hidden" value="Angebot" id="Status" name="Status" />
|
||||
<input type="hidden" value="" id="Zeitraum" name="ZeitraumVon" />
|
||||
<input type="hidden" value="" id="Zeitraum" name="ZeitraumBis" />
|
||||
<input type="hidden" value="" id="Student" name="Student" />
|
||||
<input type="hidden" value="" id="Lehrender" name="Lehrender" />
|
||||
% for field in data['content']:
|
||||
% if field!='id' and field!='Status' and field!='ZeitraumVon' and field!='ZeitraumBis' and field!='Lehrender' and field!='Student':
|
||||
<div class="clFormRow">
|
||||
<label for="${field}">${field}</label>
|
||||
% if field!='Firma':
|
||||
<input type="text" value=
|
||||
% if data['content'][field] != field:
|
||||
"${data['content'][field]}" id="${field}" name="${field}" />
|
||||
% else:
|
||||
"" id="${field}" name="${field}" />
|
||||
% endif
|
||||
% else:
|
||||
<select name="Firma" form="idForm">
|
||||
% for option in data['Firmen']:
|
||||
<option value="${data['Firmen'][option]['Name']}">${data['Firmen'][option]['Name']}</option>
|
||||
% endfor
|
||||
</select>
|
||||
% endif
|
||||
</div>
|
||||
% endif
|
||||
% endfor
|
||||
% endif
|
||||
|
||||
<div id="idButtonArea" class="clButtonArea">
|
||||
<a href="/index" title="Zurück zur Startseite">Zurück zur Startseite</a>
|
||||
<a href="/category/?cat=${data['category']}" title="Zurueck zur Startseite">Zurück zur übersicht</a>
|
||||
<input type="submit" value="Speichern" />
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
@ -1,66 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>
|
||||
Praxisphasenmanager (PPM)
|
||||
</title>
|
||||
<meta charset="UTF-8" />
|
||||
<style type="text/css">
|
||||
@import url("/style.css");
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1 id="idSiteHeader" class="clSiteHeader">
|
||||
<a href="/index" title="Zurück zur Startseite">Praxisphasenmanager (PPM)</a>
|
||||
</h1>
|
||||
|
||||
<form id="idForm" class="clContent" action="/saveChoice" method="POST">
|
||||
<h2 id="idContentHeader" class="clContentHeader">
|
||||
Praxisphasenangebots Auswahl
|
||||
</h2>
|
||||
<div id="idContentArea" class="clContentArea">
|
||||
<input type="hidden" value="${data['id']}" id="id" name="id" />
|
||||
<input type="hidden" value="${data['Name']}" id="Name" name="Name" />
|
||||
<input type="hidden" value="${data['Firma']}" id="Firma" name="Firma" />
|
||||
<input type="hidden" value="${data['Beschreibung']}" id="Beschreibung" name="Beschreibung" />
|
||||
<input type="hidden" value="${data['Voraussetzungen']}" id="Voraussetzungen" name="Voraussetzungen" />
|
||||
<input type="hidden" value="${data['Firmenbetreuer']}" id="Firmenbetreuer" name="Firmenbetreuer" />
|
||||
<input type="hidden" value="aktuell" id="Status" name="Status" />
|
||||
|
||||
<div class="clFormRow">
|
||||
<label for="Student">Student</label>
|
||||
<select name="Student" form="idForm">
|
||||
% for option in data['Studenten']:
|
||||
<option value="${data['Studenten'][option]['id']}">${data['Studenten'][option]['Name']}</option>
|
||||
% endfor
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="clFormRow">
|
||||
<label for="Lehrender">Lehrender</label>
|
||||
<select name="Lehrender" form="idForm">
|
||||
% for option in data['Lehrender']:
|
||||
<option value="${data['Lehrender'][option]['id']}">${data['Lehrender'][option]['Name']}</option>
|
||||
% endfor
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="clFormRow">
|
||||
<label for="ZeitraumVon">Zeitraum: Von (D.M.Y)</label>
|
||||
<input type="text" value="" id="ZeitraumVon" name="ZeitraumVon" />
|
||||
</div>
|
||||
|
||||
<div class="clFormRow">
|
||||
<label for="ZeitraumBis">Zeitraum: Bis (D.M.Y)</label>
|
||||
<input type="text" value="" id="ZeitraumBis" name="ZeitraumBis" />
|
||||
</div>
|
||||
|
||||
<div id="idButtonArea" class="clButtonArea">
|
||||
<a href="/index" title="Zurück zur Startseite">Zurück zur Startseite</a>
|
||||
<a href="/choice" title="Zurück zur übersicht">Zurück zur übersicht</a>
|
||||
<input type="submit" value="Speichern" />
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
@ -1,56 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>
|
||||
Praxisphasenmanager (PPM)
|
||||
</title>
|
||||
<meta charset="UTF-8" />
|
||||
<style type="text/css">
|
||||
@import url("/style.css");
|
||||
</style>
|
||||
<script src="/functionsChoice.js" type="text/javascript"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<h1 id="idSiteHeader" class="clSiteHeader">
|
||||
<a href="/index" title="Zurück zur Startseite">Praxisphasenmanager (PPM)</a>
|
||||
</h1>
|
||||
<div id="idContent" class="clContent">
|
||||
<h2 id="idContentHeader" class="clContentHeader">
|
||||
Übersicht Praxisphasen Auswahl
|
||||
</h2>
|
||||
<div id="idContentArea" class="clContentArea">
|
||||
|
||||
<table id="idList">
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Firma</th>
|
||||
<th>Beschreibung</th>
|
||||
<th>Voraussetzungen</th>
|
||||
<th>Firmenbetreuer</th>
|
||||
</tr>
|
||||
% if data['content']!= None:
|
||||
% for entries in data['content']:
|
||||
<tr id=${entries}>
|
||||
<td id=${entries}>${data['content'][entries]['Name']}</td>
|
||||
<td id=${entries}>${data['content'][entries]['Firma']}</td>
|
||||
<td id=${entries}>${data['content'][entries]['Beschreibung']}</td>
|
||||
<td id=${entries}>${data['content'][entries]['Voraussetzungen']}</td>
|
||||
<td id=${entries}>${data['content'][entries]['Firmenbetreuer']}</td>
|
||||
</tr id=${entries}>
|
||||
% endfor
|
||||
|
||||
% endif
|
||||
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div id="idButtonArea" class="clButtonArea">
|
||||
<a href="/index" class="clButton">Startseite</a>
|
||||
<a class="clButton" id="Annehmen">Annehmen</a>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
<footer>
|
||||
</footer>
|
||||
</html>
|
@ -1,146 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>
|
||||
Praxisphasenmanager (PPM)
|
||||
</title>
|
||||
<meta charset="UTF-8" />
|
||||
<style type="text/css">
|
||||
@import url("/style.css");
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<h1 id="idSiteHeader" class="clSiteHeader">
|
||||
<a href="/index" title="Zurück zur Startseite">Praxisphasenmanager (PPM)</a>
|
||||
</h1>
|
||||
<div id="idContent" class="clContent">
|
||||
<h2 id="idContentHeader" class="clContentHeader">
|
||||
Übersicht: ${data['category']}
|
||||
</h2>
|
||||
<div id="idContentArea" class="clContentArea">
|
||||
% if data['category'] == 'Firmen':
|
||||
% for firmen in data:
|
||||
% if firmen != 'category':
|
||||
<h3>${firmen}</h3>
|
||||
<table id="idList">
|
||||
<tr>
|
||||
<th>Status</th>
|
||||
<th>Student</th>
|
||||
<th>Lehrender</th>
|
||||
<th>Zeitraum: Von</th>
|
||||
<th>Zeitraum: Bis</th>
|
||||
</tr>
|
||||
% for aktuell in data[firmen]['Angebote']['aktuell']:
|
||||
<tr>
|
||||
<td>Aktuell</td>
|
||||
<td>${data[firmen]['Angebote']['aktuell'][aktuell]['Student']}</td>
|
||||
<td>${data[firmen]['Angebote']['aktuell'][aktuell]['Lehrender']}</td>
|
||||
<td>${data[firmen]['Angebote']['aktuell'][aktuell]['ZeitraumVon']}</td>
|
||||
<td>${data[firmen]['Angebote']['aktuell'][aktuell]['ZeitraumBis']}</td>
|
||||
</tr>
|
||||
% endfor
|
||||
% for abgeschlossen in data[firmen]['Angebote']['abgeschlossen']:
|
||||
<tr>
|
||||
<td>Abgeschlossen</td>
|
||||
<td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['Student']}</td>
|
||||
<td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['Lehrender']}</td>
|
||||
<td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['ZeitraumVon']}</td>
|
||||
<td>${data[firmen]['Angebote']['abgeschlossen'][abgeschlossen]['ZeitraumBis']}</td>
|
||||
</tr>
|
||||
% endfor
|
||||
</table>
|
||||
% endif
|
||||
% endfor
|
||||
% endif
|
||||
|
||||
% if data['category'] == 'Studenten':
|
||||
% for studenten in data:
|
||||
% if studenten != 'category':
|
||||
<h3>${studenten}</h3>
|
||||
<table id="idList">
|
||||
<tr>
|
||||
<th>Lehrender</th>
|
||||
<th>Firma</th>
|
||||
<th>Praxisphase</th>
|
||||
<th>Status</th>
|
||||
<th>Zeitraum: Von</th>
|
||||
<th>Zeitraum: Bis</th>
|
||||
</tr>
|
||||
% for angebote in data[studenten]['Angebote']['aktuell']:
|
||||
<tr>
|
||||
<td>${data[studenten]['Angebote']['aktuell'][angebote]['Lehrender']}</td>
|
||||
<td>${data[studenten]['Angebote']['aktuell'][angebote]['Firma']}</td>
|
||||
<td>${data[studenten]['Angebote']['aktuell'][angebote]['Praxisphase']}</td>
|
||||
<td>${data[studenten]['Angebote']['aktuell'][angebote]['Status']}</td>
|
||||
<td>${data[studenten]['Angebote']['aktuell'][angebote]['ZeitraumVon']}</td>
|
||||
<td>${data[studenten]['Angebote']['aktuell'][angebote]['ZeitraumBis']}</td>
|
||||
</tr>
|
||||
% endfor
|
||||
% for angebote in data[studenten]['Angebote']['abgeschlossen']:
|
||||
<tr>
|
||||
<td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Lehrender']}</td>
|
||||
<td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Firma']}</td>
|
||||
<td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Praxisphase']}</td>
|
||||
<td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['Status']}</td>
|
||||
<td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['ZeitraumVon']}</td>
|
||||
<td>${data[studenten]['Angebote']['abgeschlossen'][angebote]['ZeitraumBis']}</td>
|
||||
</tr>
|
||||
% endfor
|
||||
|
||||
|
||||
</table>
|
||||
% endif
|
||||
% endfor
|
||||
% endif
|
||||
|
||||
% if data['category'] == 'Lehrender':
|
||||
% for Lehrender in data:
|
||||
% if Lehrender != 'category':
|
||||
<h3>${Lehrender}</h3>
|
||||
<table id="idList">
|
||||
<tr>
|
||||
<th>Student</th>
|
||||
<th>Firma</th>
|
||||
<th>Praxisphase</th>
|
||||
<th>Status</th>
|
||||
<th>Zeitraum: Von</th>
|
||||
<th>Zeitraum: Bis</th>
|
||||
</tr>
|
||||
% if data[Lehrender] != NULL:
|
||||
% for angebote in data[Lehrender]['Angebote']['aktuell']:
|
||||
<tr>
|
||||
<td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Student']}</td>
|
||||
<td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Firma']}</td>
|
||||
<td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Praxisphase']}</td>
|
||||
<td>${data[Lehrender]['Angebote']['aktuell'][angebote]['Status']}</td>
|
||||
<td>${data[Lehrender]['Angebote']['aktuell'][angebote]['ZeitraumVon']}</td>
|
||||
<td>${data[Lehrender]['Angebote']['aktuell'][angebote]['ZeitraumBis']}</td>
|
||||
</tr>
|
||||
% endfor
|
||||
% for angebote in data[Lehrender]['Angebote']['abgeschlossen']:
|
||||
<tr>
|
||||
<td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Student']}</td>
|
||||
<td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Firma']}</td>
|
||||
<td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Praxisphase']}</td>
|
||||
<td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['Status']}</td>
|
||||
<td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['ZeitraumVon']}</td>
|
||||
<td>${data[Lehrender]['Angebote']['abgeschlossen'][angebote]['ZeitraumBis']}</td>
|
||||
</tr>
|
||||
% endfor
|
||||
% endif
|
||||
</table>
|
||||
% endif
|
||||
% endfor
|
||||
% endif
|
||||
</div>
|
||||
|
||||
<div id="idButtonArea" class="clButtonArea">
|
||||
<a href="/index" class="clButton">Startseite</a>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
<footer>
|
||||
<!--<script src="/functions.js" type="text/javascript"></script>-->
|
||||
</footer>
|
||||
</html>
|
@ -216,10 +216,10 @@ class PPM
|
||||
context: this
|
||||
})
|
||||
.done(function (json) {
|
||||
console.log("JSON: ", json);
|
||||
//console.log("JSON: ", json);
|
||||
|
||||
var result = this.TemplateManager_o.execute_px( template, json );
|
||||
console.log("RESULT: ", result);
|
||||
//console.log("RESULT: ", result);
|
||||
|
||||
//$( ".clContent" ).replaceWith(result);
|
||||
$( ".clContent" ).empty();
|
||||
|
Loading…
x
Reference in New Issue
Block a user