diff --git a/Praktikum2/ppm1/static/functions.js b/Praktikum2/ppm1/static/functions.js index 20acdea..ffbfb53 100644 --- a/Praktikum2/ppm1/static/functions.js +++ b/Praktikum2/ppm1/static/functions.js @@ -41,6 +41,14 @@ function select(category, mode) { function highlight(e) { if (selected[0]) selected[0].className = ''; e.target.parentNode.className = 'selected'; +<<<<<<< HEAD var tr = e.target.parentNode; +======= +<<<<<<< HEAD + var tr = e.target.parentNode; +======= + var tr = event_opl.target.parentNode; +>>>>>>> 8825fc510535fc545cb82dcdf3e43792144e6d2e +>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1 selectedId = tr.getAttribute('id'); } \ No newline at end of file diff --git a/Praktikum2/ppm1/static/style.css b/Praktikum2/ppm1/static/style.css index 9dcd8c3..d9917a8 100644 --- a/Praktikum2/ppm1/static/style.css +++ b/Praktikum2/ppm1/static/style.css @@ -1 +1,210 @@ -body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}.clSiteHeader{position:absolute;top:0;left:0;right:0;height:100px;line-height:100px;margin:0;padding:5px;font-size:40pt;text-align:center;text-shadow:black 3px 2px;font-family:"Open Sans",sans-serif;background-color:#084791;border:none;border-radius:60px;}.clSiteHeader a{text-decoration:none;color:white;}.clSiteHeader:hover{background-color:#0D71E4;cursor:pointer;}.clSiteHeader a:visited,a:active{color:white;text-decoration:none;}.clContent{position:absolute;top:150px;left:0;right:0;bottom:0;margin:0;padding:5px;background-repeat:no-repeat;background-position:bottom left;}.clContentHeader{position:absolute;top:20px;left:0;right:0;height:30px;line-height:30px;margin:0;padding:5px;font-size:18pt;text-align:center;}.clContentArea{position:absolute;top:80px;left:0;right:0;bottom:0px;margin:10px 0;margin-left:10px;padding:5px;background-attachment:#819FF7;}.clButtonArea{position:absolute;left:0;right:0;bottom:0;height:80px;line-height:80px;margin:0;padding:5px;text-align:center;background-color:#FFFFFF;}.clButtonArea a,input[type="submit"]{margin:0 5px;padding:3px 6px;font-size:14pt;text-decoration:none;border:2px solid;color:white;background-color:#084791;}.clButtonArea a:hover{color:white;background-color:#0D71E4;cursor:pointer;}.clButtonArea a:visited,a:active{color:white;}.clNavButton{display:inline-block;text-align:center;background-color:#084791;border:1px solid black;color:white;padding:15px 32px;text-decoration:none;font-size:16px;cursor:pointer;float:left;clear:left;width:20%;margin-left:38%;margin-right:30%;}.clNavButton:hover{background-color:#0D71E4;}#idList{table-layout:fixed;width:auto;border:2px solid;border-collapse:collapse;margin:auto;}#idList th{text-align:center;padding-left:5px;background-color:white;padding:3px;border:2px solid;}#idList td{padding:3px;border:2px solid;cursor:pointer;}#idForm .clContentArea{width:500px;margin:auto;}.selected{background-color:#0D71E4;color:white;}.clFormRow{position:relative;height:30px;margin-bottom:10px;}.clFormRow label{position:absolute;top:0;left:0;width:240px;text-align:center;}.clFormRow input{position:absolute;top:0;left:250px;width:250px;}.clFormRow select{position:absolute;top:0;left:250px;width:250px;}h3{text-align:center;} \ No newline at end of file +<<<<<<< HEAD +body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}.clSiteHeader{position:absolute;top:0;left:0;right:0;height:100px;line-height:100px;margin:0;padding:5px;font-size:40pt;text-align:center;text-shadow:black 3px 2px;font-family:"Open Sans",sans-serif;background-color:#084791;border:none;border-radius:60px;}.clSiteHeader a{text-decoration:none;color:white;}.clSiteHeader:hover{background-color:#0D71E4;cursor:pointer;}.clSiteHeader a:visited,a:active{color:white;text-decoration:none;}.clContent{position:absolute;top:150px;left:0;right:0;bottom:0;margin:0;padding:5px;background-repeat:no-repeat;background-position:bottom left;}.clContentHeader{position:absolute;top:20px;left:0;right:0;height:30px;line-height:30px;margin:0;padding:5px;font-size:18pt;text-align:center;}.clContentArea{position:absolute;top:80px;left:0;right:0;bottom:0px;margin:10px 0;margin-left:10px;padding:5px;background-attachment:#819FF7;}.clButtonArea{position:absolute;left:0;right:0;bottom:0;height:80px;line-height:80px;margin:0;padding:5px;text-align:center;background-color:#FFFFFF;}.clButtonArea a,input[type="submit"]{margin:0 5px;padding:3px 6px;font-size:14pt;text-decoration:none;border:2px solid;color:white;background-color:#084791;}.clButtonArea a:hover{color:white;background-color:#0D71E4;cursor:pointer;}.clButtonArea a:visited,a:active{color:white;}.clNavButton{display:inline-block;text-align:center;background-color:#084791;border:1px solid black;color:white;padding:15px 32px;text-decoration:none;font-size:16px;cursor:pointer;float:left;clear:left;width:20%;margin-left:38%;margin-right:30%;}.clNavButton:hover{background-color:#0D71E4;}#idList{table-layout:fixed;width:auto;border:2px solid;border-collapse:collapse;margin:auto;}#idList th{text-align:center;padding-left:5px;background-color:white;padding:3px;border:2px solid;}#idList td{padding:3px;border:2px solid;cursor:pointer;}#idForm .clContentArea{width:500px;margin:auto;}.selected{background-color:#0D71E4;color:white;}.clFormRow{position:relative;height:30px;margin-bottom:10px;}.clFormRow label{position:absolute;top:0;left:0;width:240px;text-align:center;}.clFormRow input{position:absolute;top:0;left:250px;width:250px;}.clFormRow select{position:absolute;top:0;left:250px;width:250px;}h3{text-align:center;} +======= +<<<<<<< HEAD +body{font-family:"Open Sans",sans-serif;font-size:12pt;padding:0;margin:0;}.clSiteHeader{position:absolute;top:0;left:0;right:0;height:100px;line-height:100px;margin:0;padding:5px;font-size:40pt;text-align:center;text-shadow:black 3px 2px;font-family:"Open Sans",sans-serif;background-color:#084791;border:none;border-radius:60px;}.clSiteHeader a{text-decoration:none;color:white;}.clSiteHeader:hover{background-color:#0D71E4;cursor:pointer;}.clSiteHeader a:visited,a:active{color:white;text-decoration:none;}.clContent{position:absolute;top:150px;left:0;right:0;bottom:0;margin:0;padding:5px;background-repeat:no-repeat;background-position:bottom left;}.clContentHeader{position:absolute;top:20px;left:0;right:0;height:30px;line-height:30px;margin:0;padding:5px;font-size:18pt;text-align:center;}.clContentArea{position:absolute;top:80px;left:0;right:0;bottom:0px;margin:10px 0;margin-left:10px;padding:5px;background-attachment:#819FF7;}.clButtonArea{position:absolute;left:0;right:0;bottom:0;height:80px;line-height:80px;margin:0;padding:5px;text-align:center;background-color:#FFFFFF;}.clButtonArea a,input[type="submit"]{margin:0 5px;padding:3px 6px;font-size:14pt;text-decoration:none;border:2px solid;color:white;background-color:#084791;}.clButtonArea a:hover{color:white;background-color:#0D71E4;cursor:pointer;}.clButtonArea a:visited,a:active{color:white;}.clNavButton{display:inline-block;text-align:center;background-color:#084791;border:1px solid black;color:white;padding:15px 32px;text-decoration:none;font-size:16px;cursor:pointer;float:left;clear:left;width:20%;margin-left:38%;margin-right:30%;}.clNavButton:hover{background-color:#0D71E4;}#idList{table-layout:fixed;width:auto;border:2px solid;border-collapse:collapse;margin:auto;}#idList th{text-align:center;padding-left:5px;background-color:white;padding:3px;border:2px solid;}#idList td{padding:3px;border:2px solid;cursor:pointer;}#idForm .clContentArea{width:500px;margin:auto;}.selected{background-color:#0D71E4;color:white;}.clFormRow{position:relative;height:30px;margin-bottom:10px;}.clFormRow label{position:absolute;top:0;left:0;width:240px;text-align:center;}.clFormRow input{position:absolute;top:0;left:250px;width:250px;}.clFormRow select{position:absolute;top:0;left:250px;width:250px;}h3{text-align:center;} +======= +body { + font-family: "Open Sans", sans-serif; + font-size: 12pt; + + padding: 0; + margin: 0; +} + +.clSiteHeader { + position: absolute; + top: 0; + left: 0; + right: 0; + height: 100px; + line-height: 100px; + margin: 0; + padding: 5px; + font-size: 40pt; + text-align: center; + text-shadow:black 3px 2px; + font-family: "Open Sans", sans-serif; + background-color: #084791; + border: none; + border-radius: 60px; +} + +.clSiteHeader a { + text-decoration: none; + color: white; +} + +.clSiteHeader:hover { + background-color: #0D71E4; + cursor: pointer; +} + +.clSiteHeader a:visited, a:active { + color: white; + text-decoration: none; +} + +.clContent { + position: absolute; + top: 150px; /* height, padding, border, margin von idSiteHeader beachten */ + left: 0; + right: 0; + bottom: 0; + margin: 0; + padding: 5px; + /*background-image: url("/img/logo.png");*/ + background-repeat: no-repeat; + background-position: bottom left; +} + +.clContentHeader { + position: absolute; + top: 20px; + left: 0; + right: 0; + height: 30px; + line-height: 30px; + margin: 0; + padding: 5px; + font-size: 18pt; + text-align: center; + +} + +.clContentArea { + position: absolute; + top: 80px; /* height, padding, border, margin von idContentHeader beachten */ + left: 0; + right: 0; + bottom: 0px; /* height, padding, border, margin von idButtonArea beachten */ + margin: 10px 0; + margin-left: 10px; + padding: 5px; + background-attachment: #819FF7 ; +} + + +.clButtonArea { + position: absolute; + left: 0; + right: 0; + /*float: left; width: 10px:*/ + bottom: 0; + height: 80px; + line-height: 80px; + margin: 0; + padding: 5px; + text-align: center; + background-color: #FFFFFF; +} + +.clButtonArea a, input[type="submit"] { + margin: 0 5px; + padding: 3px 6px; + font-size: 14pt; + text-decoration: none; + border: 2px solid; + color: white; + background-color: #084791; + +} + +.clButtonArea a:hover { + color: white; + background-color: #0D71E4; + cursor: pointer; +} + +.clButtonArea a:visited, a:active { + color: white; +} + +.clNavButton { + display: inline-block; + text-align: center; + background-color: #084791; + border: 1px solid black; + color: white; + padding: 15px 32px; + text-decoration: none; + font-size: 16px; + cursor: pointer; + float: left; + clear: left; + width:20%; + margin-left: 38%; + margin-right: 30%; +} + +.clNavButton:hover { + background-color: #0D71E4; +} + + +#idList { + table-layout: fixed; + width: auto; + border: 2px solid; + border-collapse: collapse; + margin:auto; +} + +#idList th { + text-align: center; + padding-left: 5px; + background-color: white; + padding: 3px; + border: 2px solid; +} + +#idList td { + padding: 3px; + border: 2px solid; + cursor: pointer; +} + +#idForm .clContentArea { + width: 500px; + margin: auto; +} + +.selected { + background-color: #0D71E4; + color: white; +} + +.clFormRow { + position: relative; + height: 30px; + margin-bottom: 10px; +} + +.clFormRow label { + position: absolute; + top: 0; + left: 0; + width: 240px; + text-align: center; +} + +.clFormRow input { + position: absolute; + top: 0; + left: 250px; + width: 250px; +} + +.clFormRow select { + position: absolute; + top: 0; + left: 250px; + width: 250px; +} + +h3 { + text-align: center; +} +/* EOF */ +>>>>>>> 8825fc510535fc545cb82dcdf3e43792144e6d2e +>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1 diff --git a/Praktikum2/ppm2/app/eval.py b/Praktikum2/ppm2/app/eval.py index 2b110d1..7289eb1 100644 --- a/Praktikum2/ppm2/app/eval.py +++ b/Praktikum2/ppm2/app/eval.py @@ -49,6 +49,11 @@ 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']] = {} diff --git a/Praktikum2/ppm2/data/Angebote/27.json b/Praktikum2/ppm2/data/Angebote/27.json index 8e35063..a00f024 100644 --- a/Praktikum2/ppm2/data/Angebote/27.json +++ b/Praktikum2/ppm2/data/Angebote/27.json @@ -1,4 +1,5 @@ { +<<<<<<< HEAD "ZeitraumBis": "02.02.2003", "Firma": "Apple", "ZeitraumVon": "02.02.2002", @@ -10,4 +11,17 @@ "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 } \ No newline at end of file diff --git a/Praktikum2/ppm2/static/html/index.html b/Praktikum2/ppm2/static/html/index.html index d7836e7..6085d20 100644 --- a/Praktikum2/ppm2/static/html/index.html +++ b/Praktikum2/ppm2/static/html/index.html @@ -18,6 +18,21 @@ Praxisphasenmanager (PPM)
+<<<<<<< HEAD +======= +

Module

+
+ +
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1