Anpassungen an CIS-Redesign

2026-06-01 12:19:28 +00:00 · 2013-07-19 15:52:02 +00:00
parent 8b1ce9ac2f
commit 54a0550724
3 changed files with 100 additions and 65 deletions
@@ -1,6 +1,6 @@
 <?php
 /**
- * Resettet den Usability Test auf der FHComplete Demoseite
+ * Resettet den Usability Test auf der CIS-Redesign Seite
 */
 require_once('../config/vilesci.config.inc.php');
 require_once('../include/basis_db.class.php');
@@ -13,9 +13,19 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 </head>
 <body>
 <h2>Reset Usability Test</h2>
+<p>
+<ul>
+	<li>Foto löschen</li>
+	<li>Fotostati löschen</li>
+	<li>Daten aus Urlaubstool löschen und Demodaten eintragen</li>
+	<li>Newseinträge löschen</li>
+</ul>
+</p>
 <form action="'.$_SERVER['PHP_SELF'].'" method="POST">
 <input type="submit" name="reset" value="Reset starten">
-</form>
+</form>';
+
+/**  echo '
 <br />
 <br />
 <h2>Abgabetool</h2>
@@ -31,33 +41,41 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <input type="hidden" value="student3" name="uid">
 <input type="submit" name="reset_abgabe" value="Projektabgaben von Student3 resetten">
 </form>
-';
+';  */

 if(isset($_POST['reset']))
 {
-	echo '<br />Resetting Usability Test ... ';
+	/*echo '	<font color="green"><ul>
+			<li>Foto gelöscht</li>
+			<li>Fotostati gelöscht</li>
+			<li>Daten aus Urlaubstool gelöscht</li>
+			</ul></font> ';*/
 	$db = new basis_db();
 	
 	$qry = "
-	delete from public.tbl_konto where person_id in (6008,5821,22186,18441,17461,12749,21728,21297,17905,21768,1671,18572,16215,17469,1211,7938,16678,22731,15892,15732,15299,18396,752,5859,16370,18749,15812,23369);
-	delete from public.tbl_konto where person_id=2656 and betrag='363.36';
-	update lehre.tbl_lehrveranstaltung set sort=NULL where studiengang_kz=10002 and semester=2;
-	delete from lehre.tbl_lehreinheitmitarbeiter where lehreinheit_id=26208;
-	delete from lehre.tbl_lehreinheitgruppe where lehreinheit_id=26260;
-	INSERT INTO lehre.tbl_lehreinheitgruppe (lehreinheitgruppe_id, lehreinheit_id, studiengang_kz, semester, verband, gruppe, gruppe_kurzbz, updateamum, updatevon, insertamum, insertvon, ext_id) VALUES ('23100', '26260', '10001', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-	delete from public.tbl_prestudentstatus where prestudent_id=(select prestudent_id from public.tbl_prestudent where person_id=4095 and studiengang_kz=10001); delete from public.tbl_prestudent where person_id=4095 and studiengang_kz=10001;
-	delete from public.tbl_prestudentstatus where prestudent_id=(select prestudent_id from public.tbl_prestudent where person_id=(select person_id from public.tbl_person where nachname='Midler'));
-	delete from public.tbl_prestudent where person_id=(select person_id from public.tbl_person where nachname='Midler');
-	delete from public.tbl_adresse where person_id=(select person_id from public.tbl_person where nachname='Midler');
-	delete from public.tbl_person where nachname='Midler';
-	";	
+	delete from public.tbl_person_fotostatus where person_id in (30566,453);
+	delete from public.tbl_ampel_benutzer_bestaetigt where uid in ('gl1','if10b066');
+	update public.tbl_person set foto=NULL, foto_sperre=FALSE where person_id in (30566,453);
+	
+	
+	delete from campus.tbl_zeitsperre where mitarbeiter_uid='gl1';
+	INSERT INTO campus.tbl_zeitsperre (zeitsperretyp_kurzbz,mitarbeiter_uid,bezeichnung,vondatum,vonstunde,bisdatum,bisstunde,vertretung_uid,updateamum,updatevon,insertamum,insertvon,erreichbarkeit_kurzbz,freigabeamum,freigabevon) VALUES ('Urlaub', 'gl1', 'Urlaub', '2013-05-01', NULL, '2013-05-03', NULL, NULL,NULL,NULL, now(), 'gl1',NULL,now(), 'kindlm');
+	INSERT INTO campus.tbl_zeitsperre (zeitsperretyp_kurzbz,mitarbeiter_uid,bezeichnung,vondatum,vonstunde,bisdatum,bisstunde,vertretung_uid,updateamum,updatevon,insertamum,insertvon,erreichbarkeit_kurzbz,freigabeamum,freigabevon) VALUES ('Urlaub', 'gl1', 'Urlaub', '2013-05-06', NULL, '2013-05-10', NULL, NULL,NULL,NULL, now(), 'gl1',NULL,now(), 'kindlm');
+	INSERT INTO campus.tbl_zeitsperre (zeitsperretyp_kurzbz,mitarbeiter_uid,bezeichnung,vondatum,vonstunde,bisdatum,bisstunde,vertretung_uid,updateamum,updatevon,insertamum,insertvon,erreichbarkeit_kurzbz,freigabeamum,freigabevon) VALUES ('Urlaub', 'gl1', 'Urlaub', '2013-07-22', NULL, '2013-07-26', NULL, NULL,NULL,NULL, now(), 'gl1',NULL,now(), 'kindlm');
+	INSERT INTO campus.tbl_zeitsperre (zeitsperretyp_kurzbz,mitarbeiter_uid,bezeichnung,vondatum,vonstunde,bisdatum,bisstunde,vertretung_uid,updateamum,updatevon,insertamum,insertvon,erreichbarkeit_kurzbz,freigabeamum,freigabevon) VALUES ('Urlaub', 'gl1', 'Urlaub', '2013-07-29', NULL, '2013-08-02', NULL, NULL,NULL,NULL, now(), 'gl1',NULL,now(), 'kindlm');
+	
+	delete from campus.tbl_news where insertvon='gl1';
+	delete from campus.tbl_contentsprache where insertvon='gl1';
+	delete from campus.tbl_content where insertvon='gl1';	
+	";
+		
 	
 	if($db->db_query($qry))
-		echo '<font color="green">done</font>';
+		echo '<font color="green">ERFOLGREICH BEENDET</font>';
 	else
-		echo '<font color="red">error</font>'.$db->db_last_error();
+		echo '<font color="red">ERROR</font>'.$db->db_last_error();
 }
-if(isset($_POST['reset_abgabe']))
+/* if(isset($_POST['reset_abgabe']))
 {
 	$uid=$_POST['uid'];
 	echo '<br />Resetting Abgabetool '.$uid.'...';
@@ -78,5 +96,5 @@ if(isset($_POST['reset_abgabe']))
 		echo '<font color="green">done</font>';
 	else
 		echo '<font color="red">error</font>'.$db->db_last_error();
-}
+}*/
 ?>
@@ -17,8 +17,11 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 				{
 					var col=0;
 					var sort=0;
+					var no_sort=1;
 					var classes = $(this).attr("class");
 					var class_arr = classes.split(" ");
+					var headersobj={};
+					
 					for(i in class_arr)
 					{
 						if(class_arr[i].indexOf("tablesorter_col_")!=-1)
@@ -29,12 +32,18 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 						{
 							 sort = class_arr[i].substr(17);
 						}
+						if(class_arr[i].indexOf("tablesorter_no_sort_")!=-1)
+						{
+							 no_sort = class_arr[i].substr(20);
+							 headersobj[no_sort]={sorter:false};
+						}
 					}

 					$(this).tablesorter(
 					{
 						sortList: [[col,sort]],
-						widgets: ["zebra"]
+						widgets: ["zebra"],
+						headers: headersobj
 					}); 
 				});
 			}); 
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format"
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	<xsl:template match="/">
@@ -6,12 +5,15 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		<head>
 			<link rel="stylesheet" href="../skin/style.css.php" type="text/css"  />
 			<title>News</title>
+			<script type="text/javascript" src="../include/js/flexcroll.js"></script>
+			<link href="../skin/flexcrollstyles.css" rel="stylesheet" type="text/css" />			
 		</head>
 		<body>
-			<table class="tabcontent">
+		<div class="flexcroll" style="outline: none;">
+			<h1>News</h1>
+			<table class="cmstable" cellspacing="0" cellpadding="0">
 			<tr>
-				<td valign="top">
-	    			<h1>News</h1>
+				<td class="cmscontent" rowspan="2" valign="top">
 					<div id="news">
 						<xsl:choose>
 							<xsl:when test="content/news">
@@ -24,13 +26,20 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 					</div>
 				</td>
 				<xsl:if test="content/stg_extras" >
-					<td></td>
-					<td class="tdvertical" valign="top" width="20%">
+					<td class="menubox">					
+						<xsl:apply-templates select="content/stg_extras/cis_ext_menu" />
+					</td>
+				</xsl:if>
+			</tr>
+			<tr>
+				<xsl:if test="content/stg_extras" >
+					<td class="teambox" style="width: 20%;">
 						<xsl:apply-templates select="content/stg_extras" />
 					</td>
 				</xsl:if>
 			</tr>
 			</table>
+		</div>
 		</body>
 		</html>	
 	</xsl:template>
@@ -65,75 +74,74 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		<br />
 	</xsl:template>
 	<xsl:template match="stg_extras">
-			<h2><b><xsl:value-of select="stg_header" /></b></h2>
+			<!-- <h1><xsl:value-of select="stg_header" /></h1>-->
 			<font face='Arial, Helvetica, sans-serif' size='2'>
-			<br />
-			<xsl:value-of select="stg_ltg_name" /><br />
+			
+			<h2><xsl:value-of select="stg_ltg_name" /></h2>
 			<xsl:apply-templates select="stg_ltg" />
-			<br />
+			
 			<xsl:if test="gf_ltg">
-				<xsl:value-of select="gf_ltg_name" /><br />
+				<h2><xsl:value-of select="gf_ltg_name" /></h2>
 				<xsl:apply-templates select="gf_ltg" />
-				<br />
+				
 			</xsl:if>
 			<xsl:if test="stv_ltg">
-				<xsl:value-of select="stv_ltg_name" /><br />
+				<h2><xsl:value-of select="stv_ltg_name" /></h2>
 				<xsl:apply-templates select="stv_ltg" />
-				<br />
+				
 			</xsl:if>
 			<xsl:if test="ass">
-				<xsl:value-of select="ass_name" /><br />
+				<h2><xsl:value-of select="ass_name" /></h2>
 				<xsl:apply-templates select="ass" />
-				<br />
+				
 			</xsl:if>
 			<xsl:value-of select="zusatzinfo" disable-output-escaping="yes"/>
 			<xsl:if test="stdv">
-				<br />
-				<xsl:value-of select="stdv_name" /><br />
+				
+				<h2><xsl:value-of select="stdv_name" /></h2>
 				<xsl:apply-templates select="stdv" />
-				<br />
+				
 			</xsl:if>
-			<xsl:apply-templates select="cis_ext_menu" />
 			</font>
 	</xsl:template>

 	<xsl:template match="stg_ltg">
-			<b><xsl:value-of select="name" /></b><br />
-			<xsl:variable name="mail" select="email"></xsl:variable>
-			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a><br />
-			Tel.:<xsl:value-of select="telefon" />
-			<br />
+			<xsl:variable name="mailname" select="email"></xsl:variable>
+			<p><a href="mailto:{$mailname}"><xsl:value-of select="name" /></a><br />			
+			T: <xsl:value-of select="telefon" /><br />
+			E: <xsl:variable name="mail" select="email"></xsl:variable>
+			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a></p>
 	</xsl:template>
 	<xsl:template match="gf_ltg">
-			<b><xsl:value-of select="name" /></b><br />
-			<xsl:variable name="mail" select="email"></xsl:variable>
-			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a><br />
-			Tel.:<xsl:value-of select="telefon" />
-			<br />
+			<xsl:variable name="mailname" select="email"></xsl:variable>
+			<p><a href="mailto:{$mailname}"><xsl:value-of select="name" /></a><br />			
+			T: <xsl:value-of select="telefon" /><br />
+			E: <xsl:variable name="mail" select="email"></xsl:variable>
+			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a></p>
 	</xsl:template>
 	<xsl:template match="stv_ltg">
-			<b><xsl:value-of select="name" /></b><br />
-			<xsl:variable name="mail" select="email"></xsl:variable>
-			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a><br />
-			Tel.:<xsl:value-of select="telefon" />
-			<br />
+			<xsl:variable name="mailname" select="email"></xsl:variable>
+			<p><a href="mailto:{$mailname}"><xsl:value-of select="name" /></a><br />			
+			T: <xsl:value-of select="telefon" /><br />
+			E: <xsl:variable name="mail" select="email"></xsl:variable>
+			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a></p>
 	</xsl:template>
 	<xsl:template match="ass">
-			<b><xsl:value-of select="name" /></b><br />
-			<xsl:variable name="mail" select="email"></xsl:variable>
-			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a><br />
-			Tel.:<xsl:value-of select="telefon" />
-			<br />
+			<xsl:variable name="mailname" select="email"></xsl:variable>
+			<p><a href="mailto:{$mailname}"><xsl:value-of select="name" /></a><br />			
+			T: <xsl:value-of select="telefon" /><br />
+			E: <xsl:variable name="mail" select="email"></xsl:variable>
+			<a href="mailto:{$mail}"><xsl:value-of select="email" /></a></p>
 	</xsl:template>
 	<xsl:template match="stdv">
 			<xsl:variable name="mail" select="email"></xsl:variable>
-			<a href="mailto:{$mail}"><xsl:value-of select="name" /></a><br />
+			<a href="mailto:{$mail}"><xsl:value-of select="name" /></a><br/>
 	</xsl:template>
 	<xsl:template match="cis_ext_menu">
 			<xsl:variable name="kurzbz" select="kurzbz"></xsl:variable>
 			<xsl:variable name="kurzbzlang" select="kurzbzlang"></xsl:variable>
-			<img src="../skin/images/seperator.gif" /><xsl:text> </xsl:text><a href="../documents/{kurzbz}/lehrziele/" class="Item" target="_blank"><xsl:value-of select="lehrziele_name" /></a><br />
-			<img src="../skin/images/seperator.gif" /><xsl:text> </xsl:text><a href="../documents/{kurzbz}/download/" class="Item" target="_blank"><xsl:value-of select="download_name" /></a><br />
-			<img src="../skin/images/seperator.gif" /><xsl:text> </xsl:text><a href="news://news.technikum-wien.at/{kurzbzlang}" class="Item" target="_blank"><xsl:value-of select="newsgroup_name" /></a><br />
+			<p><xsl:text> </xsl:text><a href="../documents/{kurzbz}/lehrziele/" class="Item" target="_blank"><xsl:value-of select="lehrziele_name" /></a></p>
+			<p><xsl:text> </xsl:text><a href="../documents/{kurzbz}/download/" class="Item" target="_blank"><xsl:value-of select="download_name" /></a></p>
+			<p><xsl:text> </xsl:text><a href="news://news.technikum-wien.at/{kurzbzlang}" class="Item" target="_blank"><xsl:value-of select="newsgroup_name" /></a></p>
 	</xsl:template>
 </xsl:stylesheet >