Changes between Version 96 and Version 97 of pps/main

Timestamp:

Feb 3, 2010, 12:29:24 PM (14 years ago)

Author:

scheusso

Comment:

—

pps/main

@@ -14 +14 @@
 
 {{{
-#!div style="background-color: #DDFFDD; border: solid 2px #000000; margin: 10px; padding: 10px; float: center;"
+#!div style="background-color: #DDFFDD; border: solid 2px #000000; margin: 10px; padding: 10px; width: 45%; float: left;"
 {{{
 #!html
-<b style="font-size:20pt;">3rd Semester</b>
+<b style="font-size:20pt;">2nd Semester</b>
+}}}
+}}}
+
+
+
+{{{
+#!div style="background-color: #DDDDFF; border: solid 2px #000000; margin: 10px; padding: 10px; width: 45%; float: right;"
+{{{
+#!html
+<b style="font-size:20pt;">4th Semester</b>
 }}}
 }}}
 
 {{{
-#!div style="background-color: #DDFFDD; border: dashed 2px #000000; margin: 10px; padding: 10px; float: left;"
-Facts about our PPS for the 3rd semester:
- * You get 8 PPS-points
- * The PPS takes place on '''Wednesday, 13:15 until 16:00'''
- * The PPS starts at the 23rd of September 2009 
- * Rooms: ETZ E 81 & ETZ G 91 (teaching, courses, tutorials) and ETL E11 (coding sessions). You will be informed about room changes via email.
+#!div style="background-color: #DDFFDD; border: dashed 2px #000000; margin: 10px; padding: 10px; width: 45%; float: left;"
+Facts about our PPS for the 2nd semester:
+ * You get 6 PPS-points
+ * The PPS takes place on '''Monday, 13:15 until 16:00'''
+ * The PPS starts at the 1st/8th of March 2010 
+ * Rooms: ETF C 109, ETZ E81 (teaching, courses, tutorials) and ETL E11 (coding sessions). You will be informed about room changes via email.
+}}}
+
+{{{
+#!div style="background-color: #DDDDFF; border: dashed 2px #000000; margin: 10px; padding: 10px; width: 45%; float: right;"
+Facts about our PPS for the 4th semester:
+ * You get 6 PPS-points
+ * The PPS takes place on '''Thursday, 13:15 until 16:00'''
+ * The PPS starts at the 4th of March 2010
+ * Rooms: ETF C 109, ETZ E81 (teaching, courses, tutorials) and ETL F11 (coding sessions). You will be informed about room changes via email.
 }}}
 
@@ -35 +54 @@
   * Coding: Knowledge from the first year of the electrical engineering studies is sufficient
   * Design: Basic knowledge of image editing or 3D modeling
-
  * Also: This is not a useless PPS, where you learn nothing and just get over with. Everything you do in the PPS will be used in Orxonox and helps to make it better.
+ In addition you learn a lot about how to work with others and participate in a project.
 }}}
 
 {{{
-#!div style="background-color: #DDFFDD; border: dashed 2px #000000; margin: 10px; padding: 10px; width: 47%; float: left;"
+#!div style="background-color: #DDFFDD; border: dashed 2px #000000; margin: 10px; padding: 10px; width: 45%; float: left;"
+For more information feel free to contact the PPS leaders:
+ * [wiki:OliScheuss Oli 'Greenman' Scheuss] (coding)
+ * [wiki:RetoGrieder Reto '1337' Grieder] (coding)
+ * [wiki:DamianFrick Damian 'Mozork' Frick] (coding)
+ * [wiki:Deca Benjamin 'diggr' de Capitani] (modeling)
+}}}
+
+{{{
+#!div style="background-color: #DDDDFF; border: dashed 2px #000000; margin: 10px; padding: 10px; width: 45%; float: right;"
 For more information feel free to contact the PPS leaders:
  * [wiki:OliScheuss Oli 'Greenman' Scheuss] (coding)
@@ -56 +84 @@
 
 {{{
-#!div style="background-color: #DDFFDD; border: dashed 2px #000000; margin: 10px; padding: 10px; width: 47%; float: left;"
+#!div style="background-color: #DDFFDD; border: solid 2px #000000; margin: 10px; padding: 10px; width: 45%; float: left;"
+{{{
+#!html
+<b style="font-size:20pt;">2nd Semester</b>
+}}}
+}}}
+
+{{{
+#!div style="background-color: #DDDDFF; border: solid 2px #000000; margin: 10px; padding: 10px; width: 45%; float: right;"
+{{{
+#!html
+<b style="font-size:20pt;">4th Semester</b>
+}}}
+}}}
+
+{{{
+#!div style="background-color: #DDFFDD; border: dashed 2px #000000; margin: 10px; padding: 10px; width: 45%; float: left;"
 || '''Date''' || '''Room''' || '''Topic''' || '''Slides''' ||
-|| 23. sep. || ETZ E81 || Introduction, SVN and modeling ||  ||
-|| 30. sep. || ETZ E81 || Framework, presentation of tickets and coding [wiki:PPS_tutorial tutorial] ||  ||
-|| 7. oct. || ETZ G91 || Styleguide, chose the projects, start planning ||  ||
-|| 14. oct. || ETL E11 ||  ||  ||
-|| 21. oct. || ETL E11 ||  ||  ||
-|| 28. oct. || ETL E11 ||  ||  ||
-|| 4. nov. || ETL E11 ||  ||  ||
-|| 11. nov. || ETL E11 ||  ||  ||
-|| 18. nov. || ETL E11 ||  ||  ||
-|| 25. nov. || ETL E11 ||  ||  ||
-|| 2. dez || ETL E11 ||  ||  ||
-|| 9. dez || ETL E11 ||  ||  ||
-|| 16. dez || ETL E11 ||  ||  ||
+|| 1 mar || ETF C109 || Introduction and modeling || ||
+|| 8 mar || ETZ E81 || Framework, SVN and coding [wiki:PPS_tutorial_new tutorial] || ||
+|| 15 mar || ETZ E81 || Chose the projects, start planning || ||
+|| 22 mar || ETL E11 ||  ||  ||
+|| 29 mar || ETL E11 ||  ||  ||
+|| 5 apr || - || Searching easter eggs ||  ||
+|| 12 apr || ETL E11 ||  ||  ||
+|| 19 apr || - || Sechseläuten ||  ||
+|| 26 apr || ETL E11 ||  ||  ||
+|| 3 may || ETL E11 ||  ||  ||
+|| 10 may || ETL E11 ||  ||  ||
+|| 17 may || ETL E11 ||  ||  ||
+|| 24 may || ETL E11 ||  ||  ||
+|| 31 may || ETL E11 ||  ||  ||
+}}}
+
+{{{
+#!div style="background-color: #DDDDFF; border: dashed 2px #000000; margin: 10px; padding: 10px; width: 45%; float: right;"
+|| '''Date''' || '''Room''' || '''Topic''' || '''Slides''' ||
+|| 4 mar || ETZ E81 || Introduction and modeling ||  ||
+|| 11 mar || ETF C109 || Framework and SVN introduction ||  ||
+|| 18 mar || ETF C109 || Coding [wiki:PPS_tutorial_new tutorial], chose the projects, start planning ||  ||
+|| 25 mar || ETL F11 ||  ||  ||
+|| 1 apr || ETL F11 ||  ||  ||
+|| 8 apr || ETL F11 ||  ||  ||
+|| 15 apr || - || Searching easter eggs ||  ||
+|| 22 apr || ETL F11 ||  ||  ||
+|| 29 apr || ETL F11 ||  ||  ||
+|| 6 may || ETL F11 ||  ||  ||
+|| 13 may || - || Ascension Day ||  ||
+|| 20 may || ETL F11 ||  ||  ||
+|| 27 may || ETL F11 || ||  ||
+|| 3 jun || ETL F11 || ||  ||
 }}}