FAS: LINES ADDED in Übernahmebestätigung

2 lines added:
. Bestellnummer
. Firma (only if firma is not null)
This commit is contained in:
cris-technikum
2018-01-31 10:54:54 +01:00
parent fbac4dfaf5
commit 674ae96597
3 changed files with 27 additions and 0 deletions
+2
View File
@@ -45,6 +45,7 @@ require_once('../include/addon.class.php');
require_once('../include/studiengang.class.php');
require_once('../include/studiensemester.class.php');
require_once('../include/studienordnung.class.php');
//require_once('../include/betriebsmittel.class.php');
$user = get_uid();
$db = new basis_db();
@@ -363,6 +364,7 @@ if(!$xml_found)
// Load the XML source
$xml_doc = new DOMDocument;
//echo $xml_url;
if(!$xml_doc->load($xml_url))
die('unable to load xml: '.$xml_url);
+6
View File
@@ -34,6 +34,7 @@ require_once('../include/datum.class.php');
require_once('../include/organisationseinheit.class.php');
require_once('../include/person.class.php');
require_once('../include/betriebsmitteltyp.class.php');
require_once('../include/betriebsmittel.class.php');
if(isset($_GET['person_id']))
$person_id = $_GET['person_id'];
@@ -109,6 +110,9 @@ else
$bmt = new betriebsmitteltyp();
$bmt->load($bmp->betriebsmitteltyp);
$typ = $bmt->result[0]->beschreibung;
$bm = new betriebsmittel($bmp->betriebsmittel_id);
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
echo '
<betriebsmittelperson>
@@ -129,6 +133,8 @@ else
<nummer><![CDATA['.$bmp->nummer.']]></nummer>
<nummer2><![CDATA['.$bmp->nummer2.']]></nummer2>
<betriebsmitteltyp><![CDATA['.$bmp->betriebsmitteltyp.']]></betriebsmitteltyp>
<bestellnummer><![CDATA['.$bm->bestellung_id.']]></bestellnummer>
<hersteller><![CDATA['.$bm->hersteller.']]></hersteller>
<typ><![CDATA['.$typ.']]></typ>
<datum><![CDATA['.date("d.m.Y").']]></datum>
</betriebsmittelperson>
+19
View File
@@ -217,6 +217,25 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
</table:table-cell>
</table:table-row>
</xsl:if>
<table:table-row>
<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
<text:p text:style-name="P18">Bestellnummer</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
<text:p text:style-name="P17"><xsl:value-of select="bestellnummer" /></text:p>
</table:table-cell>
</table:table-row>
<!--add line "firma" only if hersteller is not null-->
<xsl:if test="hersteller != ''">
<table:table-row>
<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
<text:p text:style-name="P18">Firma</text:p>
</table:table-cell>
<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
<text:p text:style-name="P17"><xsl:value-of select="hersteller" /></text:p>
</table:table-cell>
</table:table-row>
</xsl:if>
<table:table-row>
<table:table-cell table:style-name="Tabelle2.A2" office:value-type="string">
<text:p text:style-name="P18">Inventarnummer</text:p>