- Auswertung Bestellung / tags

- Berechtigungen für WaWi User
- Zuweisung Kostenstellen-Konto

include/tags.class.php

@@ -137,7 +137,7 @@ class tags extends basis_db
 	 * Gibt alle Tags eines Bestelldetails zurück
 	 * @param $bestelldetail_id
 	 */
-	public function GetTagsByBesteldetail($bestelldetail_id)
+	public function GetTagsByBestelldetail($bestelldetail_id)
 	{
 		if($bestelldetail_id == '')
 		{

system/checksystem.php

@@ -1578,6 +1578,8 @@ if(!@$db->db_query('SELECT * FROM wawi.tbl_konto LIMIT 1'))
 			GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_kontakt TO wawi;
 			GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_standort TO wawi;
 			GRANT SELECT, INSERT, UPDATE, DELETE ON public.tbl_personfunktionstandort TO wawi;
+			GRANT SELECT ON public.tbl_studiensemester TO wawi;
+			GRANT SELECT ON public.tbl_studiengang TO wawi;
 			
 			GRANT SELECT, UPDATE ON SEQUENCE public.tbl_firma_firma_id_seq TO wawi;
 			GRANT SELECT, UPDATE ON SEQUENCE public.tbl_person_person_id_seq TO wawi;
@@ -1588,6 +1590,8 @@ if(!@$db->db_query('SELECT * FROM wawi.tbl_konto LIMIT 1'))
 			GRANT SELECT, UPDATE ON SEQUENCE public.tbl_personfunktionstandort_personfunktionstandort_id_seq TO wawi;
 			GRANT SELECT, UPDATE ON SEQUENCE wawi.seq_aufteilung_default_aufteilung_id TO wawi;
 			GRANT SELECT, UPDATE ON SEQUENCE wawi.seq_aufteilung_aufteilung_id TO wawi;
+			GRANT SELECT, UPDATE ON SEQUENCE wawi.seq_bestellung_bestellung_id TO wawi;
+			GRANT SELECT, UPDATE ON SEQUENCE wawi.seq_bestelldetail_bestelldetail_id TO wawi;
 			
 			
 			-- INDEX

system/sync/kontokostenstelle.php

@@ -0,0 +1,41 @@
+<?php
+/* Copyright (C) 2010 FH Technikum Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Karl Burkhart <karl.burkhart@technikum-wien.at>.
+ */
+
+require_once('../../config/wawi.config.inc.php');
+require_once('../../include/basis_db.class.php');
+require_once('../../include/wawi_kostenstelle.class.php');
+
+$kostenstelle = new wawi_kostenstelle();
+$kostenstelle->getAll();
+$db = new basis_db();
+
+foreach($kostenstelle->result as $row)
+{
+	$qry = "INSERT INTO wawi.tbl_konto_kostenstelle(konto_id, kostenstelle_id, insertamum, insertvon) 
+			SELECT konto_id, $row->kostenstelle_id, now(),'oesi' FROM wawi.tbl_konto WHERE konto_id<1000
+			AND konto_id NOT IN(SELECT konto_id FROM wawi.tbl_konto_kostenstelle WHERE kostenstelle_id='$row->kostenstelle_id')";
+
+	if(!$db->db_query($qry))
+		echo 'Failed:'.$qry;
+}
+echo '<br /><br />DONE';
+?>

vilesci/statistik/wawi_tags.php

@@ -0,0 +1,274 @@
+<?php
+/* Copyright (C) 2010 FH Technikum Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Karl Burkhart <karl.burkhart@technikum-wien.at>.
+ */
+/**
+ * Auswertung der Bestellungen auf Kostenstellen und Tags
+ */
+require_once('../../config/wawi.config.inc.php');
+require_once('../../include/benutzerberechtigung.class.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/wawi_rechnung.class.php');
+require_once('../../include/wawi_bestellung.class.php');
+require_once('../../include/wawi_kostenstelle.class.php');
+require_once('../../include/studiensemester.class.php');
+require_once('../../include/tags.class.php');
+
+$user = get_uid();
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($user);
+
+$kst_array = $rechte->getKostenstelle();
+
+if(count($kst_array)==0)
+	die('Sie benötigen eine Kostenstellenberechtigung um diese Seite anzuzeigen');
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+	<title>WaWi - Tags - Auswertung</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../skin/wawi.css" type="text/css">
+	<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css">
+		
+	<script type="text/javascript" src="../../include/js/jquery.js"></script> 
+	<script type="text/javascript" src="../../include/js/jquery.metadata.js"></script> 
+	<script type="text/javascript" src="../../include/js/jquery.tablesorter.js"></script>
+	<script type="text/javascript">
+	$(document).ready(function() 
+	{
+		$("#myTable").tablesorter(
+		{
+			sortList: [[1,0]],
+			widgets: ['zebra']
+		});			
+ 	});
+
+ 	function alleMarkieren(checked)
+ 	{
+ 	 	inputs = document.getElementsByTagName('input');
+
+ 	 	for each(i in inputs)
+ 	 	{
+ 	 	 	if(i.type=='checkbox')
+ 	 	 	{
+ 	 	 	 	i.checked=checked;
+ 	 	 	}
+ 	 	}
+ 	}
+	</script>
+</head>
+<body>
+<h1>Auswertung - Tags</h1>
+<?php
+if(isset($_POST['show']))
+{
+	if(!isset($_POST['kst']))
+		die('Sie müssen mindestens eine Kostenstelle auswählen!<br> <a href="#Zurueck" onclick="javascript:history.back()">Zurück</a>');
+	
+	$db = new basis_db();
+	
+	//Vom Studiensemester
+	$studiensemester = $_POST['studiensemester'];
+	$stsem = new studiensemester();
+	$stsem->load($studiensemester);
+	$beginn = $stsem->start;
+	$studiensemester2 = $stsem->getNextFrom($stsem->getNextFrom($studiensemester));
+	$ende = $stsem->start;
+	if($beginn==$ende)
+		$ende = $stsem->ende;
+		
+	$kst_tags=array();
+	$tags_array=array();
+	
+	$qry = "SELECT 
+				(menge*preisprove*(100+mwst)/100) as brutto, tbl_bestellung.bestellung_id, 
+				tbl_bestellung.kostenstelle_id, tbl_bestelldetail.bestelldetail_id
+			FROM 
+				wawi.tbl_bestellung 
+				JOIN wawi.tbl_bestellung_bestellstatus USING(bestellung_id)
+				JOIN wawi.tbl_bestelldetail USING(bestellung_id)
+			WHERE
+				tbl_bestellung_bestellstatus.bestellstatus_kurzbz='Bestellung'
+				AND tbl_bestellung_bestellstatus.datum>='$beginn' AND tbl_bestellung_bestellstatus.datum<'$ende' 
+				AND tbl_bestellung.freigegeben
+				AND
+				(
+				EXISTS (SELECT 1 FROM wawi.tbl_bestellungtag WHERE bestellung_id=tbl_bestellung.bestellung_id)
+				OR
+				EXISTS (SELECT 1 FROM wawi.tbl_bestelldetailtag WHERE bestelldetail_id=tbl_bestelldetail.bestelldetail_id)
+				) 
+			";
+	
+	if($result = $db->db_query($qry))
+	{
+		while($row = $db->db_fetch_object($result))
+		{
+			//Bestelldetailtags laden
+			$tags = new tags();
+			$tags->GetTagsByBestelldetail($row->bestelldetail_id);
+			
+			if(count($tags->result)==0)
+			{
+				//Wenn kein Detailtag vorhanden ist, die Tags der Bestellung verwenden
+				$tags->GetTagsByBestellung($row->bestellung_id);
+			}
+			
+			foreach($tags->result as $tag)
+			{
+				if(!isset($tags_array[$tag->tag]))
+					$tags_array[$tag->tag]=0;
+				if(isset($kst_tags[$row->kostenstelle_id]) && isset($kst_tags[$row->kostenstelle_id][$tag->tag]))
+					$kst_tags[$row->kostenstelle_id][$tag->tag]+=$row->brutto;
+				else
+					$kst_tags[$row->kostenstelle_id][$tag->tag]=$row->brutto;
+				
+			}
+		}
+	}
+	else
+		die('Fehler bei Datenbankzugriff');
+	//$tags_array = array_unique($tags_array);
+	//var_dump($tags_array);
+	//var_dump($kst_tags);
+	echo '<table class="tablesorter" id="myTable">
+		<thead>
+			<tr>
+				<th>Kostenstelle</th>';
+	foreach(array_keys($tags_array) as $tags)
+	{		
+		echo '<th>',$tags,'</th>';
+	}
+	echo '
+				<th>Summe</th>
+			</tr>
+		</thead>
+	<tbody>';
+
+	
+	foreach($kst_tags as $kst=>$tags_value)
+	{
+		$kst_summe=0;
+		
+		$kostenstelle = new wawi_kostenstelle();
+		$kostenstelle->load($kst);
+		echo '<tr>';
+		echo '<td>'.$kostenstelle->bezeichnung.'</td>';
+		
+		foreach(array_keys($tags_array) as $tags)
+		{
+			if(isset($tags_value[$tags]))
+			{
+				echo '<td class="number">',number_format($tags_value[$tags],2,',','.'),'</td>';
+				//Kostenstellensumme berechnen
+				$kst_summe += $tags_value[$tags];
+				
+				//Tagsumme berechnen
+				$tags_array[$tags]+=$tags_value[$tags];
+			}
+			else
+				echo '<td>&nbsp;</td>';
+		}
+		echo '<td class="number">',number_format($kst_summe,2,',','.'),'</td>';
+		echo '</tr>';
+	}
+	echo '</tbody>
+		 <tfoot>
+		 	<tr>
+		 		<th>Summe</th>';
+	$gesamt_summe=0;
+	foreach($tags_array as $tags=>$summe)
+	{
+		$gesamt_summe+=$summe;
+		echo '<th class="number">',number_format($summe,2,',','.'),'</th>';
+	}
+	echo '<th class="number">',number_format($gesamt_summe,2,',','.'),'</th>';
+	echo '</tr>
+		</tfoot>
+	</table>';
+}
+else
+{
+	$kostenstelle = new wawi_kostenstelle();
+	$kostenstelle->loadArray($kst_array);
+	echo 'Bitte markieren sie die Kostenstellen die auf der Auswertung aufscheinen sollen:<br /><br />
+	<form action="'.$_SERVER['PHP_SELF'].'" method="POST">
+		<table>
+		
+		<tbody>';
+	$anzahl=0;
+	$gesamt = count($kst_array);
+	echo '<td valign="top"><table>';
+	foreach($kostenstelle->result as $kst)
+	{
+		if($anzahl%(($gesamt/3)+1)==0)
+		{
+			echo '</table></td><td valign="top"><table>';
+		}
+		echo '<tr>
+				<td><input type="checkbox" name="kst[]" value="'.$kst->kostenstelle_id.'"></td>
+				<td nowrap>'.$kst->bezeichnung.'</td>
+			</tr>';
+		$anzahl++;
+	}
+	echo '</table></td>';
+	
+	echo '</tbody>
+	<tfoot>
+		<tr>
+			<td><input type="checkbox" name="allemarkieren" onclick="alleMarkieren(this.checked)"></td>
+			<td>Alle markieren</td>
+		</tr>
+	</tfoot>
+	</table>
+	<br />
+	Studienjahr
+	<SELECT name="studiensemester" >';
+	$studsem = new studiensemester();
+	$ws = $studsem->getaktorNext(1);
+	
+	$studsem->getAll();
+
+	foreach ($studsem->studiensemester as $stsemester)
+	{
+		if($stsemester->studiensemester_kurzbz==$ws)
+			$selected='selected';
+		else 
+			$selected='';
+		if(substr($stsemester->studiensemester_kurzbz, 0, 2)=='WS')
+		{
+			$stsem_obj = new studiensemester();
+			$ss1 = $stsem_obj->getNextFrom($stsemester->studiensemester_kurzbz);
+			$ws1 = $stsemester->studiensemester_kurzbz;
+			echo '<option value="'.$stsemester->studiensemester_kurzbz.'" '.$selected.'>'.$ws1.'/'.$ss1.'</option>';			
+		}
+		
+	}
+	echo '
+	</SELECT>
+	<br />
+	<br />
+	<input type="submit" value="Anzeigen" name="show">
+	</form>';
+}
+?>
+<br /><br /><br /><br /><br /><br /><br /><br />
+</body>
+</html>

wawi/bestellung.php

@@ -1250,7 +1250,7 @@ if($aktion == 'suche')
 		echo "<td><input type='text' size='5' class='number' name='mwst_$i' id='mwst_$i' maxlength='5' value='$mwst' onChange='calcLine($i);'></input></td>\n";
 		echo "<td><input type='text' size='10' class='number' name ='brutto_$i' id='brutto_$i' value='$brutto' disabled></input></td>\n";
 		$detail_tag = new tags(); 
-		$detail_tag->GetTagsByBesteldetail($bestelldetail_id);
+		$detail_tag->GetTagsByBestelldetail($bestelldetail_id);
 		$help = $detail_tag->GetStringTags(); 
 		echo "<td><input type='text' size='10' name='detail_tag_$i' id='detail_tag_$i' style='display:none' value='$help' ></input></td>"; 
 		

wawi/rechnung.php

@@ -68,8 +68,7 @@ if(isset($_POST['getBetragRow']) && isset($_POST['id']))
 	<script type="text/javascript" src="../include/js/jquery.autocomplete.min.js" ></script>
 	<script type="text/javascript" src="../include/js/jquery-ui.js" ></script>
 	<script type="text/javascript" src="../include/js/jquery.ui.datepicker-de.js"></script> 
-	
-	
+		
 	<script type="text/javascript">
 	function loadFirma(id)
 	{
@@ -125,8 +124,7 @@ if(isset($_POST['getBetragRow']) && isset($_POST['id']))
 				widgets: ['zebra']
 			});			
 	 	});
-	 	
-			
+	 
 	</script>
 </head>
 <body>