diff --git a/htdocs/fichinter/index.php3 b/htdocs/fichinter/index.php3 index 0e56224fae3..7e3afe9190b 100644 --- a/htdocs/fichinter/index.php3 +++ b/htdocs/fichinter/index.php3 @@ -35,7 +35,7 @@ if ($sortfield == "") { print_titre("Liste des fiches d'intervention"); -$sql = "SELECT s.nom,s.idp, f.ref,".$db->pdate("f.datei")." as dp, f.rowid as fichid, f.fk_statut"; +$sql = "SELECT s.nom,s.idp, f.ref,".$db->pdate("f.datei")." as dp, f.rowid as fichid, f.fk_statut, f.duree"; $sql .= " FROM societe as s, llx_fichinter as f "; $sql .= " WHERE f.fk_soc = s.idp "; $sql .= " ORDER BY f.datei DESC ;"; @@ -48,7 +48,8 @@ if ( $db->query($sql) ) { print "Num"; print "Societe"; print "Date"; - print "Statut"; + print 'Durée'; + print "Statut "; print "\n"; $var=True; while ($i < $num) { @@ -58,6 +59,7 @@ if ( $db->query($sql) ) { print "fichid\">$objp->ref\n"; print "idp\">$objp->nom\n"; print "".strftime("%d %B %Y",$objp->dp)."\n"; + print ''.sprintf("%.1f",$objp->duree).''; print "$objp->fk_statut\n"; print '[Fiche Inter]'; print "\n"; diff --git a/htdocs/fichinter/tex-fichinter.pl b/htdocs/fichinter/tex-fichinter.pl index 08ddc7a9d3a..3ef1a5d3894 100755 --- a/htdocs/fichinter/tex-fichinter.pl +++ b/htdocs/fichinter/tex-fichinter.pl @@ -155,15 +155,19 @@ close (FH); # # Body # - +my ($line) = (0); open (FH, "<$tempfilename") || die "can't open $tempfilename: $!"; while () { print FC $_; print FC "\\\\\n"; + $line++; } close (FH); - +while ($line < 15) { + print FC "\\\\\n"; + $line++; +} # # Footer