PPM2: select

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

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

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']] = {}

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
 }

Praktikum2/ppm2/static/html/index.html

@@ -18,6 +18,21 @@
          <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>

Praktikum2/ppm2/static/js/ppm.js

@@ -6,6 +6,7 @@ class PPM
 {
     constructor ()
     {
+<<<<<<< HEAD
         this.BodyDataAction();
 
         this.TemplateManager_o = new TemplateManager_cl();
@@ -33,11 +34,18 @@ 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':
@@ -80,6 +88,7 @@ class PPM
                 this.LoadContent('/eval/?cat=Firmen', 'listEval.tpl');
                 break
             
+<<<<<<< HEAD
             case 'NewStudenten':
 
                 console.log("NewStudenten");
@@ -124,6 +133,8 @@ class PPM
                 console.log("DeleteFirmen", selectedId);
                 break
 
+=======
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
             default:
 
                 alert ('[PPM] Unbekannte Anfrage: ' + message);
@@ -139,6 +150,7 @@ class PPM
             context: this
         })
         .done(function (json) {
+<<<<<<< HEAD
             //console.log("JSON: ", json);
 
             var result = this.TemplateManager_o.execute_px( template, json );
@@ -149,6 +161,15 @@ 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 );
@@ -156,9 +177,19 @@ 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
 });

Praktikum2/ppm2/templates/index.tpl

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

Praktikum2/ppm2/templates/list.tpl

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+      <div id="idContent" class="clContent">
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1
         <h2 id="idContentHeader" class="clContentHeader">
           &Uumlbersicht: #context['category']#
         </h2>
@@ -36,6 +40,7 @@
                   @endif@
                   </tr id=#entries#>
               @endfor@
+<<<<<<< HEAD
             @endif@
           </table>
 
@@ -44,4 +49,18 @@
           <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>
+        </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

Praktikum2/ppm2/templates/listChoice.tpl

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

Praktikum2/ppm2/templates/listEval.tpl

@@ -1,9 +1,17 @@
+<<<<<<< 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">
@@ -117,5 +125,11 @@
          </div>
 
          <div id="idButtonArea" class="clButtonArea"> 
+<<<<<<< HEAD
             <a class="clButton" data-action="index">Startseite</a>
-         </div> 
+         </div> 
+=======
+            <a data-action="index" class="clButton">Startseite</a>
+         </div> 
+      </div>
+>>>>>>> b2f022ec66108999eed47f8683cae851793ff6c1