--- print/izvjestaj.pl	2000/04/27 10:57:11	1.2
+++ print/izvjestaj.pl	2000/04/27 12:21:29	1.3
@@ -2,7 +2,7 @@
 
 use strict;
 
-my $debug=1;
+my $debug=0;
 
 use DBI;
 use POSIX qw(strftime);
@@ -19,8 +19,8 @@
 open(HTML,"> $html_file") || die "html: $!";
 open(MAIL,"|/usr/lib/sendmail biljana.gombar\@pliva.hr,izvjestaji\@support.pliva.hr") || die "sendmail: $!";
 } else {
-open(HTML,"> /tmp/debug$$.html") || die "html: $!";
-open(MAIL,"> /tmp/debug$$.mail") || die "sendmail: $!";
+open(HTML,"> /tmp/debug.html") || die "html: $!";
+open(MAIL,"> /tmp/debug.mail") || die "sendmail: $!";
 }
 
 print HTML '
@@ -59,9 +59,9 @@
 print MAIL "Otvorenih računa: ",$#osoba_id_za_print+1,"
 Datum i vrijeme generiranja izvještaja: $currdate
 
-Izvještaj se nalazi i na
+Izvještaj za štampanje se nalazi na
 http://support.pliva.hr/$html_file
-(npr. za ispis na štampaču)
+sa potpunim podacima o umrežavanju, lokaciji računala i osobe
 
 ";
 print HTML "Otvorenih računa: ",$#osoba_id_za_print+1,"
@@ -70,26 +70,47 @@
 $sth = $dbh->prepare("
 	select osobe.id,ime,prezime,tel,lokacije.naziv,
 		org_jed.naziv,org_pod_jed.pod_naziv,
-		lok_racunala,objekt,kat,soba,z_rac
+		lok_racunala,objekt,kat,soba,z_rac,umrezavanje
 	from osobe
 	where osobe.id in (".join(",",@osoba_id_za_print).")
 		and lokacija_id=lokacije.id and org_jed_id=org_jed.id
 		and org_pod_jed_id=org_pod_jed.pod_id
+		and podesavanje=true
 	order by lokacije.naziv,org_jed.naziv
 	") || die $dbh->errstr();
 $sth->execute() || die $sth->errstr();
 
 my $rbr=1;
+my $lokacija='';
 
 printf MAIL ("%3s %4s %-20s %4s %-30s %-20s\n","rbr","id","ime i prezime","tel","lokacija","org.jed");
 print HTML '<table border=1>
 <tr bgcolor="#e0e0f0"><th>rbr</th><th>id</th><th>ime i prezime</th><th>tel</th><th>lokacija</th><th>org.jed</th></tr>
+<tr bgcolor="#e0e0f0"><th></th><th></th><th>lokacija računala, mreža</th><th>ž</th><th colspan=2>objekat / kat / soba</th></tr>
 ';
 
+my $bgcol='';
+my $mreza='';
+
 while (my @arr = $sth->fetchrow_array() ) {
 	printf MAIL ("%3s %4s %-20s %4s %-30s %-20s\n",$rbr,$arr[0],"$arr[1] $arr[2]",$arr[3],$arr[4],"$arr[5] $arr[6]");
-	print HTML "<tr><td>$rbr</td><td>$arr[0]</td><td>$arr[1] $arr[2]</td><td>$arr[3]</td><td>$arr[4]</td><td>$arr[5]<br>$arr[6]</td></tr>\n";
+	if ($lokacija ne $arr[4]) {
+		$lokacija=$arr[4];
+		print HTML "<tr bgcolor=#000000><td colspan=6><font size=+1 color=#ffffff>$lokacija</font></td></tr>";
+	}
+	print HTML "<tr$bgcol><td>$rbr</td><td>$arr[0]</td><td>$arr[1] $arr[2]</td><td>tel: $arr[3]</td><td><small>$arr[4]</small></td><td>$arr[5]<br>$arr[6]</td></tr>\n";
+	if ($arr[12] == 0) {
+		$mreza='umreženo';
+	} else {
+		$mreza='<b>potrebno umrežavanje</b>';
+	}
+	print HTML "<tr$bgcol><td colspan=2>&nbsp;</td><td><small>$arr[7] $mreza</small></a><td><small>ž-$arr[11]</small></td><td colspan=2><small>$arr[8] / $arr[9] / $arr[10]</small></td></tr>\n";
 	$rbr++;
+	if ($rbr % 2 == 0) {
+		$bgcol=' bgcolor=#eeeeee';
+	} else {
+		$bgcol='';
+	}
 }
 
 $sth->finish;