--- html/lista.php	2000/04/12 06:41:50	1.1.1.1
+++ html/lista.php	2002/01/25 14:47:46	1.16
@@ -1,12 +1,16 @@
 <?
 
 	include("inc/head.inc");
+	include("inc/prava.inc");
+	include("inc/checkbox.inc");
+	include("inc/sap_org_jed.inc");
 
 	if (! isset($from)) {
 		$from=0;
+		$podesavanje="on"; $umrezavanje="on";
 	}
 
-	if (! isset($kontakt_osoba_id)) {
+	if (! isset($kontakt_osoba_id) || ! intval($kontakt_osoba_id)!=0) {
 		echo '<form method="post" action="'.$PHP_SELF.'?'.$QUERY_STRING.'" name="forma">
 			Odaberite Vaše ime i prezime:
 			<select name="kontakt_osoba_id">';
@@ -23,9 +27,10 @@
 			<input type=submit value="Posebno označi moje zahtjeve">
 			</form>';
 	} else {
-		$result = pg_Exec ($conn, "select ime,prezime,passwd from kontakt_osobe where aktivna=true and id=$kontakt_osoba_id");
+		$result = pg_Exec ($conn, "select ime,prezime,passwd,prava from kontakt_osobe where aktivna=true and id=$kontakt_osoba_id");
 		$row=pg_fetch_array($result,0);
 		print "<small>Trenutno ste prijavljeni kao $row[ime] $row[prezime], ako je to krivo odaberite <a href=\"$PHP_SELF?what=relogin\">ovaj link</a>.</small>";
+		$prava=$row[prava];
 	}
 
 	function option($value,$text,$current) {
@@ -36,18 +41,13 @@
 		echo ">$text</option>";
 	}
 
-	function checkbox($name,$current) {
-        	echo "<input type=\"checkbox\" name=\"$name\"";
-		if (isset($current)) {
-			echo " checked";
-		}
-		echo ">";
-	}
 
 	if (! isset($sql_upit)) { $sql_upit="novi_na_vrh"; }
 
 	echo '	<form method="post" action="'.$PHP_SELF.'?'.$QUERY_STRING.'" name="forma2">
-		<input type=submit value="Prikaži">
+		Upišite ime ili prezime po kojem želite pretraživati:
+			<input type=text name=imepr size=40 value="'.$imepr.'">
+		<br><input type=submit value="Prikaži">
 		slogove
 		<select name="sql_upit">
 		';
@@ -57,13 +57,17 @@
 		option("novi_na_vrh","noviji na početak popisa",$sql_upit);
 		option("order_ime","sortirano po imenu",$sql_upit);
 		option("order_prezime","sortirano po prezimenu",$sql_upit);
+		option("umrezavanje","potrebno umrežavanje",$sql_upit);
 
 	echo '	</select>
 		<small><i>za opcije označenje zvjezdicom (*) prvo morate
 		odabrati Vaše ime i prezime!</i></small>
-		<input type=hidden name=from value=0>
-		<input type=hidden name=kontakt_osoba_id value='.$kontakt_osoba_id.'>
-		<br><small>Prikaži status zahtjeva za:
+		<input type=hidden name=from value=0>';
+
+	if (isset($kontakt_osoba_id)) {
+		echo '<input type=hidden name=kontakt_osoba_id value='.$kontakt_osoba_id.'>';
+	}
+	echo '<br><small>Prikaži status zahtjeva za:
 		',checkbox("shell",$shell),' shell
 		',checkbox("podesavanje",$podesavanje),' podešavanje
 		',checkbox("umrezavanje",$umrezavanje),' umrežavanje
@@ -73,22 +77,18 @@
 
 	$on_page=50;
 
-	$conn = pg_connect("dbname=informatika user=dpavlin");
-
 		$sql_polja="osobe.id as id,osobe.ime as ime,
 			osobe.prezime as prezime,
-			org_jed.naziv||'<br><small>'||org_pod_jed.pod_naziv||'<small>' as orgjed,
 			kontakt_osobe.ime||' '||kontakt_osobe.prezime as kontakt_osoba,
-			e_mail,kontakt_osoba_id
+			e_mail,kontakt_osoba_id,sifra
 			";
-		$sql_tablice="osobe,org_jed,kontakt_osobe";
-		$sql_where="org_jed.id=org_jed_id
-			and org_pod_jed.pod_id=org_pod_jed_id
-			and kontakt_osoba_id=kontakt_osobe.id
+		$sql_tablice="osobe,kontakt_osobe";
+		$sql_where="
+			kontakt_osoba_id=kontakt_osobe.id
+			and osobe.aktivna=true
 			";
 		$sql_order="order by id";
 
-
 	if (isset($sql_upit)) {
 		switch($sql_upit) {
 			case "samo_moji":
@@ -105,6 +105,9 @@
 			case "novi_na_vrh":
 				$sql_order="order by id desc";
 				break;
+			case "umrezavanje":
+				$sql_where.=" and umrezavanje is true";
+				break;
 		}
 	}
 
@@ -118,9 +121,20 @@
 		$sql_polja.=",umrezavanje";
 	}
 
-	$sql="select $sql_polja from $sql_tablice where $sql_where $sql_order limit $on_page,$from";
+	if (isset($imepr) && $imepr != "") {
+		$sql_where.=
+                  "and (upper(toczs(osobe.prezime)) like upper(toczs('$imepr'))
+                  or upper(toczs(osobe.ime)) like upper(toczs('$imepr')))";
+	}
+
+	$sql="select $sql_polja 
+              from $sql_tablice 
+              where $sql_where 
+              $sql_order 
+              limit $on_page,$from";
 
 #	echo "<pre>$sql</pre>";
+#	echo "<pre>$sql_where</pre>";
 	$result = pg_Exec ($conn, "$sql");
 
 	echo "<table border=1>
@@ -130,18 +144,12 @@
 		<th>organizacijska jedinica</th>
 		<th>status zahtjeva</th>
 		<th>kontakt osoba</th>
+		<td><small>",pg_numrows($result),"</small></td>
 		</tr>
 		";
 
-	function print_bool($val) {
-		if ($val == 't') {
-			print "da";
-		} elseif ($val == 'f') {
-			print "ne";
-		} else {
-			print "nepoznato";
-		}
-	}
+	include("inc/print_bool2.inc");
+
 
 	for ($k = 0; $k < pg_numrows($result); $k++) {
 		$row=pg_fetch_array($result,$k);
@@ -151,15 +159,15 @@
 			print '<tr bgcolor="#f0f0f0">';
 		}
 		print "<td>";
-		if ($row[kontakt_osoba_id]==$kontakt_osoba_id) {
+		if ($row[kontakt_osoba_id]==$kontakt_osoba_id || isset($prava) && $prava==$pr_admin) {
 			print "<a href=\"osoba.php?what=select-osoba&id=$row[id]\">$row[id]</a>";
 		} else {
 			print "$row[id]";
 		}
 		print "</td><td>$row[ime] $row[prezime]</td>
-			<td>$row[orgjed]</td><td>";
+			<td><small>".sap_org_jed($row[sifra])."</small></td><td>";
 			
-		$result1 = pg_Exec ($conn, "select datum,opis from status,status_tip where status.status_tip_id=status_tip.id and osoba_id=$row[id]");
+		$result1 = pg_Exec ($conn, "select datum,opis from status,status_tip where status.status_tip_id=status_tip.id and osoba_id=$row[id] order by datum");
 		for ($l = 0; $l < pg_numrows($result1); $l++) {
 			$row1=pg_fetch_array($result1,$l);
 			print "<small>$row1[datum]</small> $row1[opis]<br>";
@@ -168,18 +176,21 @@
 
 
 		if (isset($shell)) {
-			print "<br>shell: ";
-			print_bool($row[shell]);
+			print "<br>shell: ".print_bool($row[shell]);
 		}
 		if (isset($podesavanje)) {
-			print "<br>podešavanje: ";
-			print_bool($row[podesavanje]);
+			print "<br>podešavanje: ".print_bool($row[podesavanje]);
 		}
 		if (isset($umrezavanje)) {
-			print "<br>umrežavanje: ";
-			print_bool($row[umrezavanje]);
+			print "<br>umrežavanje: ".print_bool($row[umrezavanje]);
 		}
-		print "</small></td></tr>";
+		print "</small>";
+		print "</td><td>
+			<a href=\"obavijest.php?id=$row[id]\">
+			<img src=pix/text.gif border=0
+			alt=\"Prikaži sve podatke o ovom zahtjevu\"></a>
+			";
+		print "</td></tr>";
 	}