Révision 892c5791 plugins/pdf/inc/plugin_pdf.functions.php
plugins/pdf/inc/plugin_pdf.functions.php | ||
---|---|---|
155 | 155 |
case COMPUTER_TYPE: |
156 | 156 |
$computer = new Computer(); |
157 | 157 |
$computer->getFromDB($ID); |
158 |
|
|
159 |
//erics on ajoute un peu de texte et |
|
160 |
//erics on simplifie l'affichage |
|
158 | 161 |
if($computer->fields['name']) |
159 |
$pdf->addText(220,$height-45,14,utf8_decode('<b>'.$computer->fields['name'].' ('.plugin_pdf_getDropdownName('glpi_entities',$computer->fields['FK_entities']).')</b>'));
|
|
162 |
$pdf->addText(220,$height-45,14,utf8_decode('<b>Inventaire du matériel: '.$computer->fields['name']));
|
|
160 | 163 |
else |
161 |
$pdf->addText(220,$height-45,14,utf8_decode('<b>'.$LANG["common"][2].' '.$computer->fields['ID'].' ('.plugin_pdf_getDropdownName('glpi_entities',$computer->fields['FK_entities']).')</b>')); |
|
164 |
$pdf->addText(220,$height-45,14,utf8_decode('<b>'.$LANG["common"][2].' '.$computer->fields['ID'].' ('.plugin_pdf_getDropdownName('glpi_entities',$computer->fields['FK_entities']).')</b>')); |
|
165 |
|
|
162 | 166 |
break; |
163 | 167 |
case SOFTWARE_TYPE: |
164 | 168 |
$software = new Software(); |
... | ... | |
210 | 214 |
} |
211 | 215 |
} |
212 | 216 |
$pdf->restoreState(); |
213 |
|
|
214 |
$pdf->addText(100,$start_tab,9,utf8_decode('<b>'.$LANG["common"][2].' '.$computer->fields['ID'].' ('.plugin_pdf_getDropdownName('glpi_entities',$computer->fields['FK_entities']).')</b>')); |
|
217 |
|
|
218 |
//erics on simplifie pas besoin de ca |
|
219 |
// $pdf->addText(100,$start_tab,9,utf8_decode('<b>'.$LANG["common"][2].' '.$computer->fields['ID'].' ('.plugin_pdf_getDropdownName('glpi_entities',$computer->fields['FK_entities']).')</b>')); |
|
215 | 220 |
$pdf->addText(30,$start_tab-20,9,utf8_decode('<b><i>'.$LANG["common"][16].' :</i></b> '.$computer->fields['name'])); |
216 | 221 |
$pdf->addText(30,$start_tab-40,9,utf8_decode('<b><i>'.$LANG["common"][17].' :</i></b> '.plugin_pdf_getDropdownName('glpi_type_computers',$computer->fields['type']))); |
217 | 222 |
$pdf->addText(30,$start_tab-60,9,utf8_decode('<b><i>'.$LANG["common"][22].' :</i></b> '.plugin_pdf_getDropdownName('glpi_dropdown_model',$computer->fields['model']))); |
... | ... | |
226 | 231 |
$pdf->addText(30,$start_tab-200,9,utf8_decode('<b><i>'.$LANG["ocsng"][6].' '.$LANG["Menu"][33].' :</i></b> '.$LANG["choice"][1])); |
227 | 232 |
else |
228 | 233 |
$pdf->addText(30,$start_tab-200,9,utf8_decode('<b><i>'.$LANG["ocsng"][6].' '.$LANG["Menu"][33].' :</i></b> '.$LANG["choice"][0])); |
229 |
|
|
230 | 234 |
$pdf->addText(30,$start_tab-240,9,utf8_decode('<b><i>'.$LANG["common"][15].' :</i></b> '.plugin_pdf_getDropdownName('glpi_dropdown_locations',$computer->fields['location']))); |
231 | 235 |
$pdf->addText(30,$start_tab-260,9,utf8_decode('<b><i>'.$LANG["common"][25].' :</i></b> ')); |
232 | 236 |
|
... | ... | |
235 | 239 |
while($temp = $pdf->addTextWrap(105,$y,2*$length_tab-80,9,$temp)) |
236 | 240 |
$y-=9; |
237 | 241 |
|
242 |
/* |
|
238 | 243 |
if(!empty($computer->fields['tplname'])) |
239 | 244 |
$pdf->addText($length_tab+35,$start_tab,9,utf8_decode('<b>'.$LANG["common"][26].' : '.convDateTime($computer->fields["date_mod"]).' ('.$LANG["common"][13].' : '.$computer->fields['tplname'].')</b>')); |
240 | 245 |
elseif($computer->fields['ocs_import']) |
241 | 246 |
$pdf->addText($length_tab+35,$start_tab,9,utf8_decode('<b>'.$LANG["common"][26].' : '.convDateTime($computer->fields["date_mod"]).' ('.$LANG["ocsng"][7].')</b>')); |
242 | 247 |
else |
243 | 248 |
$pdf->addText($length_tab+80,$start_tab,9,utf8_decode('<b>'.$LANG["common"][26].' : '.convDateTime($computer->fields["date_mod"]).'</b>')); |
249 |
*/ |
|
244 | 250 |
|
245 | 251 |
$pdf->addText($length_tab+35,$start_tab-20,9,utf8_decode('<b><i>'.$LANG["common"][18].' :</i></b> '.$computer->fields['contact'])); |
246 | 252 |
$pdf->addText($length_tab+35,$start_tab-40,9,utf8_decode('<b><i>'.$LANG["common"][21].' :</i></b> '.$computer->fields['contact_num'])); |
... | ... | |
2223 | 2229 |
|
2224 | 2230 |
$tab_pdf["pdf"] = plugin_pdf_add_header($tab_pdf["pdf"],$ID,COMPUTER_TYPE); |
2225 | 2231 |
$tab_pdf = plugin_pdf_config_computer($tab_pdf,$width,$ID); |
2232 |
//erics, on ajoute systematiquement le contenu materiel ... |
|
2233 |
$tab_pdf = plugin_pdf_device($tab_pdf,$width,$ID,COMPUTER_TYPE); |
|
2226 | 2234 |
|
2227 | 2235 |
for($i=0;$i<count($tab);$i++) |
2228 | 2236 |
{ |
Formats disponibles : Unified diff