[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7028] print and pdf for contracts
From: |
Lars Hopland Nestćs |
Subject: |
[Fmsystem-commits] [7028] print and pdf for contracts |
Date: |
Mon, 21 Feb 2011 13:55:38 +0000 |
Revision: 7028
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7028
Author: larshn
Date: 2011-02-21 13:55:38 +0000 (Mon, 21 Feb 2011)
Log Message:
-----------
print and pdf for contracts
Modified Paths:
--------------
trunk/rental/inc/class.uimakepdf.inc.php
trunk/rental/templates/base/pdf/rental_contract_form_hybler.php
trunk/rental/templates/base/pdf/rental_contract_form_personalbolig.php
Property Changed:
----------------
trunk/rental/
Property changes on: trunk/rental
___________________________________________________________________
Modified: svn:ignore
- wkhtmltopdt_test.php
testphp.php
+ wkhtmltopdt_test.php
testphp.php
SnappyPdf.php
SnappyMedia.php
google.pdf
Modified: trunk/rental/inc/class.uimakepdf.inc.php
===================================================================
--- trunk/rental/inc/class.uimakepdf.inc.php 2011-02-21 11:45:09 UTC (rev
7027)
+++ trunk/rental/inc/class.uimakepdf.inc.php 2011-02-21 13:55:38 UTC (rev
7028)
@@ -335,13 +335,20 @@
$composites =
rental_socomposite::get_instance()->get(null, null, null, null, null, null,
array('contract_id' => $contract->get_id()));
$composite = reset($composites);
+ $units = $composite->get_units();
+ $unit = reset($units);
+
+ $price_items =
rental_socontract_price_item::get_instance()->get(null, null, null, null, null,
null, array('contract_id' => $contract->get_id()));
+
$data = array
(
'contract' => $contract,
'contract_party' => $party,
'contract_dates' =>
$contract_dates,
'composite' => $composite,
+ 'unit' => $unit,
+ 'price_items' =>$price_items,
'notification' => $notification,
'editable' => $editable,
'message' => isset($message) ?
$message : phpgw::get_var('message'),
@@ -351,9 +358,10 @@
);
$contract->check_consistency();
- // include PHPGW_SERVER_ROOT .
"/rental/inc/plugins/fellesdata/party.edit.php";
+
-
$this->render('pdf/rental_contract_form_hybler.php', $data);
+ //
$this->render('pdf/rental_contract_form_hybler.php', $data);
+
$this->render('pdf/rental_contract_form_personalbolig.php', $data);
}
}
else
Modified: trunk/rental/templates/base/pdf/rental_contract_form_hybler.php
===================================================================
--- trunk/rental/templates/base/pdf/rental_contract_form_hybler.php
2011-02-21 11:45:09 UTC (rev 7027)
+++ trunk/rental/templates/base/pdf/rental_contract_form_hybler.php
2011-02-21 13:55:38 UTC (rev 7028)
@@ -1,5 +1,7 @@
<?php
$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+$valuta_prefix = isset($config->config_data['currency_prefix']) ?
$config->config_data['currency_prefix'] : '';
+$valuta_suffix = isset($config->config_data['currency_suffix']) ?
$config->config_data['currency_suffix'] : '';
?>
<style>
<?php include "css/contract.css"?>
@@ -16,7 +18,7 @@
<dt><span class="checkbox_bg"><input type="checkbox" /></span> 
Innflytting</dt>
<dd> </dd>
<dt>Navn:</dt>
- <dd><?php echo $contract->get_party_name_as_list();?></dd>
+ <dd><?php echo $contract_party->get_first_name()." ".
$contract_party->get_last_name();?></dd>
<dt>Fnr.:</dt>
<dd><?php echo $contract_party->get_identifier();?></dd>
<dt>Adresse:</dt>
@@ -55,42 +57,20 @@
<div class="one_column">
<table>
+<?php
+foreach ($price_items as $item)
+{
+ ?>
<tr>
- <td>Husleie uten mĂžbler</td>
+ <td width="80%"><?php echo $item->get_title();?></td>
<td>Kr.:</td>
- <td>[hentes fra db]</td>
+ <td align="right"><?php echo $valuta_prefix; ?> <?php
echo number_format($item->get_total_price()/12,2,',',' '); ?> <?php
echo $valuta_suffix; ?></td>
<td>Pr.mnd.</td>
</tr>
- <tr>
- <td>Husleie med mĂžbler</td>
- <td>Kr.:</td>
- <td>[hentes fra db]</td>
- <td>Pr.mnd.</td>
- </tr>
- <tr>
- <td>Utstyr</td>
- <td>Kr.:</td>
- <td>[hentes fra db]</td>
- <td>Pr.mnd.</td>
- </tr>
- <tr>
- <td>SengetĂžy/HĂ„ndduker</td>
- <td>Kr.:</td>
- <td>[hentes fra db]</td>
- <td>Pr.mnd.</td>
- </tr>
- <tr>
- <td>Husleie</td>
- <td>Kr.:</td>
- <td>[hentes fra db]</td>
- <td>Pr.mnd.</td>
- </tr>
- <tr>
- <td>1 mnd forskudd</td>
- <td>Kr.:</td>
- <td>[hentes fra db]</td>
- <td>Pr.mnd.</td>
- </tr>
+
+ <?php
+}
+?>
</table>
</div>
@@ -102,7 +82,7 @@
</div>
<div class="one_column">
-<p>Dato:</p>
+<p>Dato: <?php echo date($date_format, time());?></p>
<table>
<tr>
<td align="center">
Modified: trunk/rental/templates/base/pdf/rental_contract_form_personalbolig.php
===================================================================
--- trunk/rental/templates/base/pdf/rental_contract_form_personalbolig.php
2011-02-21 11:45:09 UTC (rev 7027)
+++ trunk/rental/templates/base/pdf/rental_contract_form_personalbolig.php
2011-02-21 13:55:38 UTC (rev 7028)
@@ -1,11 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Leiekontrakt for pesonalbolig</title>
-<link rel="stylesheet" type="text/css" href="css/contract.css" />
-</head>
-<body>
+<?php
+$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+$valuta_prefix = isset($config->config_data['currency_prefix']) ?
$config->config_data['currency_prefix'] : '';
+$valuta_suffix = isset($config->config_data['currency_suffix']) ?
$config->config_data['currency_suffix'] : '';
+?>
+<style>
+<?php include "css/contract.css"?>
+</style>
+
<img
src="http://www.nordlandssykehuset.no/getfile.php/NLSH_bilde%20og%20filarkiv/Internett/NLSH_logo_siste.jpg%20%28352x58%29.jpg"
alt="Nordlanssykehuset logo" />
<h1>LEIEKONTRAKT</h1>
<h2>FOR PERSONALBOLIG</h2>
@@ -20,17 +21,17 @@
<tr>
<td>Nordlandssykehuset</td>
<td bgcolor="#C0C0C0" width="120px">Navn:</td>
- <td>[hentes fra db]</td>
+ <td><?php echo $contract->get_party_name_as_list();?></td>
</tr>
<tr>
<td>Boligseksjonen</td>
<td bgcolor="#C0C0C0">FĂždselsnummer:</td>
- <td>[hentes fra db]</td>
+ <td><?php echo $contract_party->get_identifier();?></td>
</tr>
<tr>
<td><strong>KlÞverÄsv. 1 8002 BodÞ</strong></td>
<td bgcolor="#C0C0C0">Arbeidssted:</td>
- <td><input type="text" /></td>
+ <td><?php echo $contract_party->get_department();?></td>
</tr>
</table>
@@ -41,7 +42,7 @@
</dl>
<dl class="checkbox_list">
<dt><input type="checkbox" /></dt>
- <dd>Gnr.[hentes fra db] Bnr. [hentes fra db] i BodĂž kommune.</dd>
+ <dd>G.nr. / B.nr. / F.nr. / S.nr. <?php echo
$unit->get_location()->get_gab_id();?> i BodĂž kommune.</dd>
</dl>
@@ -78,8 +79,8 @@
<dd>Leiekontrakten gjelder en <i>PERSONALBOLIG</i>s, bolig som leier
har leid i egenskap av arbeidstaker, og er knyttet opp mot leiers tilsetting i
Nordlandssykehuset.<br />
<i>OBS: Utleieformen gir leier fĂŠrre rettigheter enn ved leie av annen
bolig.</i></dd>
<dt><input type="checkbox" /></dt>
- <dd>Leieforholdet er tidsbestemt og starter den [hentes fra db] kl.
1200<br />
- og opphĂžrer uten oppsigelse den [hentes fra db] kl. 1200<br />
+ <dd>Leieforholdet er tidsbestemt og starter den <?php echo
date($date_format, $contract_dates->get_start_date());?> kl. 1200<br />
+ og opphĂžrer uten oppsigelse den <?php echo date($date_format,
$contract_dates->get_end_date());?> kl. 1200<br />
<i>Minstetiden er i utgangspunktet tre Ă„r for tidsbestemte leieavtaler.
Dersom kortere tid enn minstetiden er valgt i denne kontrakt, er det likevel
lovlig fordi utleier har en annen saklig grunn
for tidsavgrensningen, jfr punkt 25.</i></dd>
<dt><input type="checkbox" /></dt>
@@ -98,9 +99,18 @@
<dt>7.</dt>
<dd>Leiesum</dd>
</dl>
+<?php
+foreach ($price_items as $item)
+{
+ if($item->get_title()=="Leie"){
+ ?>
<p>Leien er ved kontraktsinngÄelse fastsatt til <br />
-Kr [hentes fra db] pr. mÄned.</p>
+Kr <?php echo $valuta_prefix; ?> <?php echo
number_format($item->get_total_price()/12,2,',',' '); ?> <?php echo
$valuta_suffix; ?> pr. mÄned.</p>
+ <?php
+ }
+}?>
+
<dl class="section_header">
<dt>8.</dt>
<dd>StrĂžm og brensel</dd>
@@ -109,8 +119,16 @@
<dl class="checkbox_list">
<dt><input type="checkbox" /></dt>
<dd>Leier tegner eget strĂžmabonnement</dd>
- <dt><input type="checkbox" /></dt>
- <dd>A konto i tillegg til leien, for tiden kr pr. mnd.</dd>
+ <?php
+ foreach ($price_items as $item)
+ {
+ if($item->get_title()=="StrĂžm"){
+ ?>
+ <dt><input type="checkbox" checked="checked" /></dt>
+ <dd><?php echo $item->get_title();?>, kr <?php echo $valuta_prefix;
?> <?php echo number_format($item->get_total_price()/12,2,',',' '); ?>
<?php echo $valuta_suffix; ?> pr. mÄned.</dd>
+ <?php
+ }
+ }?>
</dl>
<dl class="section_header">
@@ -119,12 +137,16 @@
</dl>
<dl class="checkbox_list">
- <dt><input type="checkbox" /></dt>
- <dd>kabel-tv, [hentes fra db] pr mÄned / kroner</dd>
- <dt><input type="checkbox" /></dt>
- <dd>miljÞtillegg, [hentes fra db] pr mÄned / kroner</dd>
- <dt><input type="checkbox" /></dt>
- <dd>garasje, [hentes fra db] pr mÄned / kroner</dd>
+<?php
+foreach ($price_items as $item)
+{
+ if(!($item->get_title()=="Leie" || $item->get_title()=="StrĂžm")){
+ ?>
+ <dt><input type="checkbox" checked="checked"/></dt>
+ <dd><?php echo $item->get_title();?>: kr <?php echo $valuta_prefix; ?>
<?php echo number_format($item->get_total_price()/12,2,',',' '); ?>
<?php echo $valuta_suffix; ?> pr. mÄned.</dd>
+ <?php
+ }
+}?>
</dl>
<dl class="section_header">
@@ -225,7 +247,7 @@
<dt><input type="checkbox" /></dt>
<dd>Dyrehold er ikke tillatt, med mindre det er skriftlig avtalt.</dd>
<dt><input type="checkbox" /></dt>
- <dd>Dyrehold er tillatt, ved at leier kan ha
.......................</dd>
+ <dd>Dyrehold er tillatt, ved at leier kan ha <input type="text" /></dd>
<dt></dt>
<dd><i>Leier kan holde dyr dersom gode grunner taler for det, og
dyreholdet ikke er til ulempe for utleier eller andre brukere av eiendommen.
Utleiers skriftlige samtykke, og eventuelle
vilkÄr for avtalt dyrehold, skal pÄfÞres denne kontrakten, jfr pkt
25.</i></dd>
@@ -308,7 +330,7 @@
<dt><input type="checkbox" /></dt>
<dd>Boligen skal selges.</dd>
<dt><input type="checkbox" /></dt>
- <dd>Ettersom Nordlandssykehuset stÄr foran salg av personalboliger mÄ
det presiseres at sykehuset ikke stÄr ansvarlig for Ä skaffe deg ny bolig
dersom salg skulle skje innen botidens utlĂžp [hentes fra db].</dd>
+ <dd>Ettersom Nordlandssykehuset stÄr foran salg av personalboliger mÄ
det presiseres at sykehuset ikke stÄr ansvarlig for Ä skaffe deg ny bolig
dersom salg skulle skje innen botidens utlĂžp <?php echo date($date_format,
$contract_dates->get_end_date());?>.</dd>
</dl>
<dl class="section_header">
@@ -320,7 +342,7 @@
<table>
<tr>
- <td colspan="2" align="center"><i>BodĂž den [dato]</i></td>
+ <td colspan="2" align="center"><i>BodĂž den <?php echo
date($date_format, time());?></i></td>
</tr>
<tr>
<th>Utleier</th>
@@ -335,12 +357,9 @@
Boligforvalter</p>
</td>
<td align="center">
- <p class="sign">[Navn pÄ leietaker hentes fra db]<br />
+ <p class="sign"><?php echo $contract_party->get_first_name()."
". $contract_party->get_last_name();?><br />
 </p>
</td>
</tr>
</table>
-<input type="submit" value="Lag pdf"></form>
-
-</body>
-</html>
\ No newline at end of file
+<input type="submit" value="Neste"></form>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7028] print and pdf for contracts,
Lars Hopland Nestćs <=