[Fmsystem-commits] [7034] print and pdf for contracts

fmsystem-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7034] print and pdf for contracts

From:	lars.nestas
Subject:	[Fmsystem-commits] [7034] print and pdf for contracts
Date:	Wed, 23 Feb 2011 08:38:15 +0000
Revision: 7034
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7034
Author:   "lars.nestas"
Date:     2011-02-23 08:38:14 +0000 (Wed, 23 Feb 2011)
Log Message:
-----------
print and pdf for contracts

Modified Paths:
--------------
    trunk/rental/templates/base/pdf/css/contract.css
    trunk/rental/templates/base/pdf/rental_contract_form_hybler.php
    trunk/rental/templates/base/pdf/rental_contract_form_personalbolig.php

Modified: trunk/rental/templates/base/pdf/css/contract.css
===================================================================
--- trunk/rental/templates/base/pdf/css/contract.css    2011-02-23 07:12:29 UTC 
(rev 7033)
+++ trunk/rental/templates/base/pdf/css/contract.css    2011-02-23 08:38:14 UTC 
(rev 7034)
@@ -7,8 +7,8 @@
 }
 
 h2 {
-       text-align: center;x
-       font-size: 25px;
+       text-align: center;
+       x font-size: 25px;
 }
 
 p {
@@ -75,7 +75,7 @@
        font-weight: bold;
 }
 
-div.contract{
+div.contract {
        margin-top: 10px;
        margin-right: 20px;
        margin-left: 20px;
@@ -87,7 +87,6 @@
        width: 100%;
        margin-bottom: 20px;
        padding: 5px 5px 5px 5px;
-
 }
 
 div.one_column {
@@ -97,7 +96,6 @@
        margin-bottom: 10px;
        margin-top: 10px;
        padding: 5px 5px 5px 5px;
-
 }
 
 div.left {
@@ -110,16 +108,14 @@
        width: 40%;
 }
 
-span.checkbox_bg{
+span.checkbox_bg {
        background-color: #ddffcc;
-       
 }
 
 table {
        width: 100%;
        font-size: 12px;
        font-family: arial;
-
 }
 
 table.header {
@@ -144,9 +140,12 @@
        margin-bottom: 10px;
 }
 
-
 input[type=text] {
        width: 300px;
        background-color: #ddffcc;
 }
 
+input[type=text].date {
+       width: 30px;
+       background-color: #ddffcc;
+}

Modified: trunk/rental/templates/base/pdf/rental_contract_form_hybler.php
===================================================================
--- trunk/rental/templates/base/pdf/rental_contract_form_hybler.php     
2011-02-23 07:12:29 UTC (rev 7033)
+++ trunk/rental/templates/base/pdf/rental_contract_form_hybler.php     
2011-02-23 08:38:14 UTC (rev 7034)
@@ -1,4 +1,8 @@
 <?php 
+if (isset($_POST['preview']))
+{
+ob_start();
+}
 $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'] : '';
@@ -7,27 +11,18 @@
 <?php include "css/contract.css"?>
 </style>
 <div class="contract">
-
-
 <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>Melding om inn/utflytting - Hybler</h1>
 
 
 <form action="" method="post">
-
 <?php
 $disabled="";
-$color_checkbox = "checkbox_bg";
 $checkb_in_value = true;
 
 if (isset($_POST['preview']) )
 {
        $disabled = 'disabled="disabled"';
-       $color_checkbox = "";
-
-       echo "er post";
-       
-
 }
 
 if(isset($_POST['checkb_in'])){?><input type="hidden" name="checkb_in_hidden"  
/><?php }
@@ -43,21 +38,28 @@
 <div class="two_column">
 
 <dl class="left_column">
-       <dt><span class="<?php echo $color_checkbox;?>"><input type="checkbox" 
name="checkb_in" <?php echo $disabled; if(isset($_POST['checkb_in']) || 
isset($_POST['checkb_in_hidden'])) {echo 'checked="checked"';}?> /></span>&nbsp 
Innflytting</dt>
+       <dt><input type="checkbox" name="checkb_in" <?php echo $disabled; 
if(isset($_POST['checkb_in']) || isset($_POST['checkb_in_hidden'])) {echo 
'checked="checked"';}?> />&nbsp Innflytting</dt>
        <dd>&nbsp</dd>
        <dt>Navn:</dt>
        <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>
-       <dd><?php echo $contract_party->get_address_1().", 
".$contract_party->get_address_2().", ".$contract_party->get_postal_code(). " 
".$contract_party->get_place()  ;?></dd>
+       <dd><?php echo $contract_party->get_address_1().", ";
+       if($contract_party->get_address_2())
+       {
+               echo $contract_party->get_address_2().", ";
+       }
+       echo $contract_party->get_postal_code(). " 
".$contract_party->get_place()  ;
+       ?>
+       </dd>
        <dt>Tildelt bolig:</dt>
        <dd><?php echo $composite->get_name();?></dd>
 </dl>
 
 
 <dl class="right_column">
-       <dt><span class="<?php echo $color_checkbox;?>"><input type="checkbox" 
name="checkb_out" <?php echo $disabled; if(isset($_POST['checkb_out'])|| 
isset($_POST['checkb_out_hidden'])) {echo 'checked="checked"';}?>/></span>&nbsp 
Utflytting</dt>
+       <dt><input type="checkbox" name="checkb_out" <?php echo $disabled; 
if(isset($_POST['checkb_out'])|| isset($_POST['checkb_out_hidden'])) {echo 
'checked="checked"';}?>/>&nbsp Utflytting</dt>
        <dd>&nbsp</dd>
        <dt>Stilling:</dt>
        <dd><?php echo $contract_party->get_title();?></dd>
@@ -73,11 +75,11 @@
 
 <div class="one_column">
 <dl class="checkbox_list">
-       <dt><span class="<?php echo $color_checkbox;?>"><input type="checkbox" 
name="checkb_keys" <?php echo $disabled; if(isset($_POST['checkb_keys']) || 
isset($_POST['checkb_keys_hidden'])) {echo 'checked="checked"';}?> 
/></span></dt>
+       <dt><input type="checkbox" name="checkb_keys" <?php echo $disabled; 
if(isset($_POST['checkb_keys']) || isset($_POST['checkb_keys_hidden'])) {echo 
'checked="checked"';}?> /></dt>
        <dd>Lever nøkler etter utflytting til vaktmesters postkasse i 
postkasserommet</dd>
-       <dt><span class="<?php echo $color_checkbox;?>"><input type="checkbox" 
name="checkb_janitor" <?php echo $disabled; if(isset($_POST['checkb_janitor']) 
|| isset($_POST['checkb_janitor_hidden'])) {echo 'checked="checked"';}?> 
/></span></dt>
+       <dt><input type="checkbox" name="checkb_janitor" <?php echo $disabled; 
if(isset($_POST['checkb_janitor']) || isset($_POST['checkb_janitor_hidden'])) 
{echo 'checked="checked"';}?> /></dt>
        <dd>Underrett vaktmester vedr. eventuelle mangler/skader</dd>
-       <dt><span class="<?php echo $color_checkbox;?>"><input type="checkbox" 
name="checkb_phone" <?php echo $disabled; if(isset($_POST['checkb_phone']) || 
isset($_POST['checkb_phone_hidden'])) {echo 'checked="checked"';}?> 
/></span></dt>
+       <dt><input type="checkbox" name="checkb_phone" <?php echo $disabled; 
if(isset($_POST['checkb_phone']) || isset($_POST['checkb_phone_hidden'])) {echo 
'checked="checked"';}?> /></dt>
        <dd>Har du tjenestetelefon – meld fra til personalkontoret (ikke 
Telenor)</dd>
 </dl>
 </div>
@@ -90,9 +92,9 @@
 {
        ?>
        <tr>
-               <td width="80%"><?php echo $item->get_title();?></td>
+               <td width="70%"><?php echo $item->get_title();?></td>
                <td>Kr.:</td>
-               <td align="right"><?php  echo $valuta_prefix; ?> &nbsp; <?php 
echo number_format($item->get_total_price()/12,2,',',' '); ?> &nbsp; <?php  
echo $valuta_suffix; ?></td>
+               <td align="right" width="15%"><?php  echo $valuta_prefix; ?> 
&nbsp; <?php echo number_format($item->get_total_price()/12,2,',',' '); ?> 
&nbsp; <?php  echo $valuta_suffix; ?></td>
                <td>Pr.mnd.</td>
        </tr>
 
@@ -109,12 +111,12 @@
 {
        ?>
 <p><?php echo $_POST['notes']?></p>
-<input type="hidden" name="notes" value="<?php echo $_POST['notes']?>" />
+<input type="hidden" name="notes" value="<?php echo 
(htmlspecialchars($_POST['notes'],ENT_QUOTES, UTF-8,true));?>" />
        <?php
 }
 else
 {
-       ?> <textarea rows="3" cols="" name="notes"><?php echo 
$_POST['notes']?></textarea> <?php
+       ?> <textarea rows="3" cols="" name="notes">blabla<?php echo 
(htmlspecialchars($_POST['notes'],ENT_QUOTES, UTF-8));?></textarea> <?php
 }
 ?> <br />
 </div>
@@ -135,15 +137,32 @@
 
 
 <p>Kopi:</p>
-<p><span class="<?php echo $color_checkbox;?>"><input type="checkbox" 
name="checkb_HR" <?php echo $disabled; if(isset($_POST['checkb_HR']) || 
isset($_POST['checkb_HR_hidden'])) {echo 'checked="checked"';}?> 
/></span>Personalkontoret</p>
-<p><span class="<?php echo $color_checkbox;?>"><input type="checkbox" 
name="checkb_payroll_office"<?php echo $disabled; 
if(isset($_POST['checkb_payroll_office']) || 
isset($_POST['checkb_payroll_office_hidden'])) {echo 'checked="checked"';}?> 
/></span>Lønningskontoret</p>
+<p><input type="checkbox" name="checkb_HR" <?php echo $disabled; 
if(isset($_POST['checkb_HR']) || isset($_POST['checkb_HR_hidden'])) {echo 
'checked="checked"';}?> />Personalkontoret</p>
+<p><input type="checkbox" name="checkb_payroll_office"<?php echo $disabled; 
if(isset($_POST['checkb_payroll_office']) || 
isset($_POST['checkb_payroll_office_hidden'])) {echo 'checked="checked"';}?> 
/>Lønningskontoret</p>
 <br />
-<?php if (isset($_POST['preview']) ){ ?>
+
+<?php if (isset($_POST['preview'])  ){ 
+$HtmlCode= ob_get_contents();
+ob_end_flush();
+
+$_SESSION['contract_html'] = $HtmlCode;
+       
+       ?>
 <input type="submit" value="Rediger" name="edit"> 
-<input type="submit" value="Lagre som PDF" name="make_PDF"> 
-<?php }else{?>
+</form>
 
-<input type="submit" value="Forhåndsvis" name="preview"> 
+<form action="<?php echo(html_entity_decode(self::link(array('menuaction' => 
'rental.uimakepdf.makePDF', 'id' => $value['id'], 'initial_load' => 
'no'))));?>" method="post">
+<input type="submit" value="Lagre som PDF" name="make_PDF" /> 
+
+</form>
+<?php
+
+
+}else{?>
+
+<input type="submit" value="Forhåndsvis" name="preview"> </form>
 <?php }?>
-</form>
+
 </div>
+
+

Modified: trunk/rental/templates/base/pdf/rental_contract_form_personalbolig.php
===================================================================
--- trunk/rental/templates/base/pdf/rental_contract_form_personalbolig.php      
2011-02-23 07:12:29 UTC (rev 7033)
+++ trunk/rental/templates/base/pdf/rental_contract_form_personalbolig.php      
2011-02-23 08:38:14 UTC (rev 7034)
@@ -81,8 +81,13 @@
 </dl>
 <dl class="checkbox_list">
        <dt><input type="checkbox" name="checkb_gab" <?php echo $disabled; 
if(isset($_POST['checkb_gab']) || isset($_POST['checkb_gab_hidden'])) {echo 
'checked="checked"';}?>  /></dt>
-       <dd>G.nr. / B.nr. / F.nr. / S.nr. <?php echo 
$unit->get_location()->get_gab_id();?>  i Bodø kommune.</dd>
+       <?php
 
+       $gab = preg_split('/ /', $unit->get_location()->get_gab_id(), -1);
+
+       ?>
+       <dd>G.nr. <?php echo $gab[0];?>  B.nr.  <?php echo $gab[2];?>  i Bodø 
kommune.</dd>
+
 </dl>
 
 <dl class="section_header">
@@ -91,7 +96,15 @@
 </dl>
 <dl class="checkbox_list">
        <dt><input type="checkbox" name="checkb_unit" <?php echo $disabled; 
if(isset($_POST['checkb_unit']) || isset($_POST['checkb_unit_hidden'])) {echo 
'checked="checked"';}?>  /></dt>
-       <dd>[hentes fra db] rom + <input type="checkbox" name="checkb_kitchen" 
<?php echo $disabled; if(isset($_POST['checkb_kitchen']) || 
isset($_POST['checkb_kitchen_hidden'])) {echo 'checked="checked"';}?>  /> 
kjøkken, <input type="checkbox" name="checkb_bath" <?php echo $disabled; 
if(isset($_POST['checkb_bath']) || isset($_POST['checkb_bath_hidden'])) {echo 
'checked="checked"';}?>  /> bad</dd>
+       <dd><?php if (isset($_POST['preview']) || isset($_POST['make_PDF']))
+       {
+               ?> <?php echo $_POST['rooms']." "?><input type="hidden" 
name="rooms" value="<?php echo $_POST['rooms']?>" /><?php
+       }
+       else
+       {
+               ?><input type="text" name="rooms" class="date" value="<?php 
echo $_POST['rooms']?>"  /><?php 
+       }
+?> rom + <input type="checkbox" name="checkb_kitchen" <?php echo $disabled; 
if(isset($_POST['checkb_kitchen']) || isset($_POST['checkb_kitchen_hidden'])) 
{echo 'checked="checked"';}?>  /> kjøkken, <input type="checkbox" 
name="checkb_bath" <?php echo $disabled; if(isset($_POST['checkb_bath']) || 
isset($_POST['checkb_bath_hidden'])) {echo 'checked="checked"';}?>  /> bad</dd>
        <dt><input type="checkbox" name="checkb_other" <?php echo $disabled; 
if(isset($_POST['checkb_other']) || isset($_POST['checkb_other_hidden'])) {echo 
'checked="checked"';}?>  /></dt>
        <dd>Annet: 
 <?php if (isset($_POST['preview'])|| isset($_POST['make_PDF']) )
@@ -421,7 +434,32 @@
        <dt><input type="checkbox" name="checkb_remarks1" <?php echo $disabled; 
if(isset($_POST['checkb_remarks1']) || isset($_POST['checkb_remarks1_hidden'])) 
{echo 'checked="checked"';}?>  /></dt>
        <dd>Boligen er øremerket til andre tilsatte.</dd>
        <dt><input type="checkbox" name="checkb_remarks2" <?php echo $disabled; 
if(isset($_POST['checkb_remarks2']) || isset($_POST['checkb_remarks2_hidden'])) 
{echo 'checked="checked"';}?>  /></dt>
-       <dd>Boligen er allerede utleid til tilsatte som skal flytte inn dag. 
måned år</dd>
+       <dd>Boligen er allerede utleid til tilsatte som skal flytte inn
+       <?php if (isset($_POST['preview']) || isset($_POST['make_PDF']))
+       {
+               ?> <?php echo $_POST['day']."/"?><input type="hidden" 
name="day" value="<?php echo $_POST['day']?>" /><?php
+       }
+       else
+       {
+               ?><input type="text" name="day" class="date" value="<?php echo 
$_POST['day']?>"  /><?php echo "/&nbsp&nbsp";
+       }
+?><?php if (isset($_POST['preview']) || isset($_POST['make_PDF']))
+       {
+               ?><?php echo $_POST['month']."/"?><input type="hidden" 
name="month" value="<?php echo $_POST['month']?>" /><?php
+       }
+       else
+       {
+               ?><input type="text" name="month" class="date" value="<?php 
echo $_POST['month']?>" /><?php echo "/&nbsp&nbsp";
+       }
+?><?php if (isset($_POST['preview']) || isset($_POST['make_PDF']))
+       {
+               ?><?php echo $_POST['year']."."?><input type="hidden" 
name="year" value="<?php echo $_POST['year']?>" /><?php 
+       }
+       else
+       {
+               ?><input type="text" name="year" class="date" value="<?php echo 
$_POST['year']?>"  /> <?php
+       }
+?> </dd>
        <dt><input type="checkbox" name="checkb_remarks3" <?php echo $disabled; 
if(isset($_POST['checkb_remarks3']) || isset($_POST['checkb_remarks3_hidden'])) 
{echo 'checked="checked"';}?>  /></dt>
        <dd>Boligen skal selges.</dd>
        <dt><input type="checkbox" name="checkb_remarks4" <?php echo $disabled; 
if(isset($_POST['checkb_remarks4']) || isset($_POST['checkb_remarks4_hidden'])) 
{echo 'checked="checked"';}?>  /></dt>
[Prev in Thread]
Current Thread
[Next in Thread]
[Fmsystem-commits] [7034] print and pdf for contracts, lars.nestas <=
Prev by Date: [Fmsystem-commits] [7033] print and pdf for contracts
Next by Date: [Fmsystem-commits] [7035] property: fix download
Previous by thread: [Fmsystem-commits] [7033] print and pdf for contracts
Next by thread: [Fmsystem-commits] [7035] property: fix download
Index(es):
- Date
- Thread