|
@@ -28,7 +28,7 @@ class Route_UrlAction_JPK extends RouteBase {
|
|
|
SE_Layout::alert('danger',$e->getMessage());
|
|
SE_Layout::alert('danger',$e->getMessage());
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
- <a href="<?php echo $this->REFERER?>" class="btn btn-primary">Powrót</a>
|
|
|
|
|
|
|
+ <a href="<?=$this->REFERER?>" class="btn btn-primary">Powrót</a>
|
|
|
</div>
|
|
</div>
|
|
|
<?php
|
|
<?php
|
|
|
SE_Layout::dol();
|
|
SE_Layout::dol();
|
|
@@ -71,9 +71,9 @@ class Route_UrlAction_JPK extends RouteBase {
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
<form method="post">
|
|
<form method="post">
|
|
|
- <input type="hidden" name="REFERER" value="<?php echo $this->REFERER?>"/>
|
|
|
|
|
|
|
+ <input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
<button type="submit" class="btn btn-primary">Edytuj</button>
|
|
<button type="submit" class="btn btn-primary">Edytuj</button>
|
|
|
- <a href="<?php echo $this->REFERER?>" class="btn btn-default">Powrót</a>
|
|
|
|
|
|
|
+ <a href="<?=$this->REFERER?>" class="btn btn-default">Powrót</a>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
|
<?php
|
|
<?php
|
|
@@ -82,7 +82,7 @@ class Route_UrlAction_JPK extends RouteBase {
|
|
|
SE_Layout::alert('warning','Wystąpił nieznany błąd podczas inicjalizowania deklaracji JPK.');
|
|
SE_Layout::alert('warning','Wystąpił nieznany błąd podczas inicjalizowania deklaracji JPK.');
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
- <a href="<?php echo $this->REFERER?>" class="btn btn-primary">Powrót</a>
|
|
|
|
|
|
|
+ <a href="<?=$this->REFERER?>" class="btn btn-primary">Powrót</a>
|
|
|
</div>
|
|
</div>
|
|
|
<?php
|
|
<?php
|
|
|
}
|
|
}
|
|
@@ -93,11 +93,11 @@ class Route_UrlAction_JPK extends RouteBase {
|
|
|
<legend>Inicjalizacja deklaracji JPK</legend>
|
|
<legend>Inicjalizacja deklaracji JPK</legend>
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
|
<label class="col-sm-3 control-label">Operator</label>
|
|
<label class="col-sm-3 control-label">Operator</label>
|
|
|
- <div class="col-sm-9" style="margin-top:7px;"><?php echo $this->BO['name1']?></div>
|
|
|
|
|
|
|
+ <div class="col-sm-9" style="margin-top:7px;"><?=$this->BO['name1']?></div>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
|
<label class="col-sm-3 control-label">Typ JPK</label>
|
|
<label class="col-sm-3 control-label">Typ JPK</label>
|
|
|
- <div class="col-sm-9" style="margin-top:7px;"><?php echo $this->JPK['TYPE']?></div>
|
|
|
|
|
|
|
+ <div class="col-sm-9" style="margin-top:7px;"><?=$this->JPK['TYPE']?></div>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
|
<label class="col-sm-3 control-label">Miesiąc, którego dotyczy deklaracja</label>
|
|
<label class="col-sm-3 control-label">Miesiąc, którego dotyczy deklaracja</label>
|
|
@@ -123,10 +123,10 @@ class Route_UrlAction_JPK extends RouteBase {
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
|
<div class="col-sm-offset-3 col-sm-9">
|
|
<div class="col-sm-offset-3 col-sm-9">
|
|
|
<button type="submit" class="btn btn-primary" name="action" value="initialize">Zapisz</button>
|
|
<button type="submit" class="btn btn-primary" name="action" value="initialize">Zapisz</button>
|
|
|
- <a href="<?php echo $this->REFERER?>" class="btn btn-default">Anuluj</a>
|
|
|
|
|
|
|
+ <a href="<?=$this->REFERER?>" class="btn btn-default">Anuluj</a>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <input type="hidden" name="REFERER" value="<?php echo $this->REFERER?>"/>
|
|
|
|
|
|
|
+ <input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
|
<script>
|
|
<script>
|
|
@@ -144,7 +144,7 @@ format: 'YYYY-MM'
|
|
|
SE_Layout::alert('danger', "Wystąpił problem z inicjalizacją deklaracji JPK - " . $e->getMessage());
|
|
SE_Layout::alert('danger', "Wystąpił problem z inicjalizacją deklaracji JPK - " . $e->getMessage());
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
- <a href="<?php echo $this->REFERER?>" class="btn btn-primary">Powrót</a>
|
|
|
|
|
|
|
+ <a href="<?=$this->REFERER?>" class="btn btn-primary">Powrót</a>
|
|
|
</div>
|
|
</div>
|
|
|
<?php
|
|
<?php
|
|
|
}
|
|
}
|
|
@@ -253,11 +253,41 @@ format: 'YYYY-MM'
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private function show() {
|
|
private function show() {
|
|
|
- SE_Layout::gora();
|
|
|
|
|
- SE_Layout::menu();
|
|
|
|
|
|
|
+ if (V::get('action','',$_POST) == "getJPK") {
|
|
|
|
|
+ try {
|
|
|
|
|
+ if (!$this->JPK['OUT_MERGED']) throw new Exception("Błąd danych - nie wygenerowano wynikowego pliku JPK");
|
|
|
|
|
+ $xml = simplexml_load_string($this->JPK['OUT_MERGED']);
|
|
|
|
|
+ $ns = $xml->getNamespaces(true);
|
|
|
|
|
+ $this->validateJPK_VAT($xml);
|
|
|
|
|
+ $fileName = preg_replace("/[: \.]/", "_", "JPK_VAT_{$this->JPK['MONTH']}_"
|
|
|
|
|
+ . str_replace('"', '', $xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->PelnaNazwa)
|
|
|
|
|
+ . "_" . str_replace("T", "_", $xml->Naglowek->DataWytworzeniaJPK)) . ".xml";
|
|
|
|
|
+ $output = $xml->asXml();
|
|
|
|
|
+ header("Content-Type: text/xml");
|
|
|
|
|
+ header("Content-Disposition: attachment; filename={$fileName};");
|
|
|
|
|
+ header("Content-Transfer-Encoding: binary");
|
|
|
|
|
+ header("Content-Length: " . strlen($output));
|
|
|
|
|
+ echo $output;
|
|
|
|
|
+ } catch (Exception $e) {
|
|
|
|
|
+ SE_Layout::gora();
|
|
|
|
|
+ SE_Layout::menu();
|
|
|
|
|
+ SE_Layout::alert('danger', $e->getMessage());
|
|
|
|
|
+?>
|
|
|
|
|
+<div class="container" style="text-align:center">
|
|
|
|
|
+ <form method="post" action="<?=$this->LAST_REFERER?>">
|
|
|
|
|
+ <input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
|
|
+ <button type="submit" class="btn btn-primary">Powrót</button>
|
|
|
|
|
+ </form>
|
|
|
|
|
+</div>
|
|
|
|
|
+<?php
|
|
|
|
|
+ SE_Layout::dol();
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
|
|
+ SE_Layout::gora();
|
|
|
|
|
+ SE_Layout::menu();
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="margin-top:20px">
|
|
<div class="container" style="margin-top:20px">
|
|
|
- <form class="form-horizontal" method="post" enctype="multipart/form-data">
|
|
|
|
|
|
|
+ <form class="form-horizontal" method="post" target="_blank">
|
|
|
<legend>
|
|
<legend>
|
|
|
Podgląd deklaracji JPK :: <?=$this->JPK['TYPE']?> - <?=$this->JPK['MONTH']." (".($this->JPK['PURPOSE'] == 1 ? "pierwsze złożenie" : "korekta").")"?>
|
|
Podgląd deklaracji JPK :: <?=$this->JPK['TYPE']?> - <?=$this->JPK['MONTH']." (".($this->JPK['PURPOSE'] == 1 ? "pierwsze złożenie" : "korekta").")"?>
|
|
|
<span class="pull-right">
|
|
<span class="pull-right">
|
|
@@ -267,21 +297,21 @@ format: 'YYYY-MM'
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
|
<div class="form-group">
|
|
<div class="form-group">
|
|
|
<div class="col-sm-10">
|
|
<div class="col-sm-10">
|
|
|
- <a href="<?=$_SERVER['HTTP_REFERER']?>&dupa=test" target="_blank" class="btn-sm btn-primary">Pobierz plik JPK</a>
|
|
|
|
|
|
|
+ <button type="submit" class="btn-sm btn-primary" name="action" value="getJPK">Pobierz plik JPK</button>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<?=$this->showTable();?>
|
|
<?=$this->showTable();?>
|
|
|
<div class="form-group" style="text-align:center">
|
|
<div class="form-group" style="text-align:center">
|
|
|
<div class="col-sm-12">
|
|
<div class="col-sm-12">
|
|
|
<input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
<input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
- <input type="hidden" name="_task" value="edit">
|
|
|
|
|
- <a href="<?=$this->REFERER?>" class="btn btn-primary">Powrót</a>
|
|
|
|
|
|
|
+ <a href="<?=$this->REFERER?>" class="btn btn-default">Powrót</a>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
|
<?php
|
|
<?php
|
|
|
- SE_Layout::dol();
|
|
|
|
|
|
|
+ SE_Layout::dol();
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private function edit() {
|
|
private function edit() {
|
|
@@ -385,8 +415,8 @@ format: 'YYYY-MM'
|
|
|
SE_Layout::alert('danger', "Wykryto abuse! Wysłano informację do administratora.");
|
|
SE_Layout::alert('danger', "Wykryto abuse! Wysłano informację do administratora.");
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
- <form method="post" action="<?php echo $this->LAST_REFERER?>">
|
|
|
|
|
- <input type="hidden" name="REFERER" value="<?php echo $this->REFERER?>"/>
|
|
|
|
|
|
|
+ <form method="post" action="<?=$this->LAST_REFERER?>">
|
|
|
|
|
+ <input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
@@ -464,6 +494,13 @@ format: 'YYYY-MM'
|
|
|
}
|
|
}
|
|
|
restore_error_handler();
|
|
restore_error_handler();
|
|
|
|
|
|
|
|
|
|
+ libxml_use_internal_errors(true);
|
|
|
|
|
+ if (!$dom->schemaValidate(APP_PATH_SCHEMA . "/jpk/Schemat_JPK_VAT(2)_v1-0.xsd")) {
|
|
|
|
|
+ $errors = '';
|
|
|
|
|
+ foreach (libxml_get_errors() as $libxml_error) $errors .= "<br/>{$libxml_error->message}";
|
|
|
|
|
+ throw new Exception("Plik JPK niezgodny ze schematem XSD{$errors}");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$xml = simplexml_load_string($dom->saveXML());
|
|
$xml = simplexml_load_string($dom->saveXML());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -488,8 +525,8 @@ format: 'YYYY-MM'
|
|
|
SE_Layout::alert('danger', $e->getMessage());
|
|
SE_Layout::alert('danger', $e->getMessage());
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
- <form method="post" action="<?php echo $this->LAST_REFERER?>">
|
|
|
|
|
- <input type="hidden" name="REFERER" value="<?php echo $this->REFERER?>"/>
|
|
|
|
|
|
|
+ <form method="post" action="<?=$this->LAST_REFERER?>">
|
|
|
|
|
+ <input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
@@ -517,8 +554,8 @@ format: 'YYYY-MM'
|
|
|
SE_Layout::alert('danger', $e->getMessage());
|
|
SE_Layout::alert('danger', $e->getMessage());
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
- <form method="post" action="<?php echo $this->LAST_REFERER?>">
|
|
|
|
|
- <input type="hidden" name="REFERER" value="<?php echo $this->REFERER?>"/>
|
|
|
|
|
|
|
+ <form method="post" action="<?=$this->LAST_REFERER?>">
|
|
|
|
|
+ <input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
@@ -630,14 +667,14 @@ EOT;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$xml = new SimpleXMLElement($xmlSchema);
|
|
$xml = new SimpleXMLElement($xmlSchema);
|
|
|
- $ns = $ns = $xml->getNamespaces(true);
|
|
|
|
|
|
|
+ $ns = $xml->getNamespaces(true);
|
|
|
|
|
|
|
|
$xml->Naglowek->CelZlozenia = $this->JPK['PURPOSE'];
|
|
$xml->Naglowek->CelZlozenia = $this->JPK['PURPOSE'];
|
|
|
$xml->Naglowek->DataWytworzeniaJPK = date("Y-m-d\TH:i:s");
|
|
$xml->Naglowek->DataWytworzeniaJPK = date("Y-m-d\TH:i:s");
|
|
|
$xml->Naglowek->DataOd = $this->JPK['MONTH'] . "-01";
|
|
$xml->Naglowek->DataOd = $this->JPK['MONTH'] . "-01";
|
|
|
$xml->Naglowek->DataDo = date("Y-m-d", strtotime($xml->Naglowek->DataOd . "+ 1 month - 1 day"));
|
|
$xml->Naglowek->DataDo = date("Y-m-d", strtotime($xml->Naglowek->DataOd . "+ 1 month - 1 day"));
|
|
|
if (!($xml->Naglowek->KodUrzedu = $this->BO['kodUrzeduSkarbowego'])) throw new Exception("blędne dane podmiotu - brak kodu urzędu skarbowego");
|
|
if (!($xml->Naglowek->KodUrzedu = $this->BO['kodUrzeduSkarbowego'])) throw new Exception("blędne dane podmiotu - brak kodu urzędu skarbowego");
|
|
|
- if (!($xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->NIP = $this->BO['nip'])) throw new Exception("blędne dane podmiotu - brak NIP");
|
|
|
|
|
|
|
+ if (!($xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->NIP = trim(str_replace("-", "", $this->BO['nip'])))) throw new Exception("blędne dane podmiotu - brak NIP");
|
|
|
if (!($xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->PelnaNazwa = $this->BO['name1'])) throw new Exception("blędne dane podmiotu - brak nazwy podmiotu");
|
|
if (!($xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->PelnaNazwa = $this->BO['name1'])) throw new Exception("blędne dane podmiotu - brak nazwy podmiotu");
|
|
|
if ($this->BO['name2']) $xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->PelnaNazwa .= " " . $this->BO['name2'];
|
|
if ($this->BO['name2']) $xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->PelnaNazwa .= " " . $this->BO['name2'];
|
|
|
if (!($xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->REGON = $this->BO['regon'])) unset($xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->REGON);
|
|
if (!($xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->REGON = $this->BO['regon'])) unset($xml->Podmiot1->IdentyfikatorPodmiotu->children($ns['etd'])->REGON);
|
|
@@ -704,19 +741,30 @@ EOT;
|
|
|
|
|
|
|
|
ksort($data);
|
|
ksort($data);
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ function addCdata(&$node, $value) {
|
|
|
|
|
+ $dom_node = dom_import_simplexml($node);
|
|
|
|
|
+ $dom_owner = $dom_node->ownerDocument;
|
|
|
|
|
+ $dom_node->appendChild($dom_owner->createCDATASection($value));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$i = 0;
|
|
$i = 0;
|
|
|
foreach ($data as $pos) {
|
|
foreach ($data as $pos) {
|
|
|
$x = $xml->addChild('SprzedazWiersz');
|
|
$x = $xml->addChild('SprzedazWiersz');
|
|
|
$x->addAttribute('typ', 'G');
|
|
$x->addAttribute('typ', 'G');
|
|
|
$x->addChild('LpSprzedazy', ++$i);
|
|
$x->addChild('LpSprzedazy', ++$i);
|
|
|
ksort($pos[1]);
|
|
ksort($pos[1]);
|
|
|
- foreach ($pos as $subpos) foreach ($subpos as $key => $value) $x->addChild($key, $value);
|
|
|
|
|
|
|
+ foreach ($pos as $subpos) foreach ($subpos as $key => $value) {
|
|
|
|
|
+ $x->addChild($key, $value);
|
|
|
|
|
+ if (!strlen($x->$key)) addCdata($x->$key, $value);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$xml->SprzedazCtrl->LiczbaWierszySprzedazy = count($data);
|
|
$xml->SprzedazCtrl->LiczbaWierszySprzedazy = count($data);
|
|
|
$xml->SprzedazCtrl->PodatekNalezny = $allVAT;
|
|
$xml->SprzedazCtrl->PodatekNalezny = $allVAT;
|
|
|
|
|
|
|
|
$this->validateJPK_VAT($xml);
|
|
$this->validateJPK_VAT($xml);
|
|
|
|
|
+
|
|
|
if ($this->JPK['IN_INSERT']) $info = "Zaimportowano dane z Insert i L1";
|
|
if ($this->JPK['IN_INSERT']) $info = "Zaimportowano dane z Insert i L1";
|
|
|
else $info = "Zaimportowano dane z L1";
|
|
else $info = "Zaimportowano dane z L1";
|
|
|
$sqlObj = new stdClass();
|
|
$sqlObj = new stdClass();
|
|
@@ -729,11 +777,11 @@ EOT;
|
|
|
} catch (Exception $e) {
|
|
} catch (Exception $e) {
|
|
|
SE_Layout::gora();
|
|
SE_Layout::gora();
|
|
|
SE_Layout::menu();
|
|
SE_Layout::menu();
|
|
|
- SE_Layout::alert('danger', "Błąd w trakcie importu danych z L1 ({$e->getMessage()})");
|
|
|
|
|
|
|
+ SE_Layout::alert('danger', "Błąd w trakcie importu danych z L1. {$e->getMessage()}");
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
- <form method="post" action="<?php echo $this->LAST_REFERER?>">
|
|
|
|
|
- <input type="hidden" name="REFERER" value="<?php echo $this->REFERER?>"/>
|
|
|
|
|
|
|
+ <form method="post" action="<?=$this->LAST_REFERER?>">
|
|
|
|
|
+ <input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
@@ -761,8 +809,8 @@ EOT;
|
|
|
SE_Layout::alert('danger', $e->getMessage());
|
|
SE_Layout::alert('danger', $e->getMessage());
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
- <form method="post" action="<?php echo $this->LAST_REFERER?>">
|
|
|
|
|
- <input type="hidden" name="REFERER" value="<?php echo $this->REFERER?>"/>
|
|
|
|
|
|
|
+ <form method="post" action="<?=$this->LAST_REFERER?>">
|
|
|
|
|
+ <input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
@@ -850,8 +898,8 @@ EOT;
|
|
|
SE_Layout::alert('danger', $e->getMessage());
|
|
SE_Layout::alert('danger', $e->getMessage());
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
- <form method="post" action="<?php echo $this->LAST_REFERER?>">
|
|
|
|
|
- <input type="hidden" name="REFERER" value="<?php echo $this->REFERER?>"/>
|
|
|
|
|
|
|
+ <form method="post" action="<?=$this->LAST_REFERER?>">
|
|
|
|
|
+ <input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
@@ -875,8 +923,8 @@ EOT;
|
|
|
SE_Layout::alert('danger', $e->getMessage());
|
|
SE_Layout::alert('danger', $e->getMessage());
|
|
|
?>
|
|
?>
|
|
|
<div class="container" style="text-align:center">
|
|
<div class="container" style="text-align:center">
|
|
|
- <form method="post" action="<?php echo $this->LAST_REFERER?>">
|
|
|
|
|
- <input type="hidden" name="REFERER" value="<?php echo $this->REFERER?>"/>
|
|
|
|
|
|
|
+ <form method="post" action="<?=$this->LAST_REFERER?>">
|
|
|
|
|
+ <input type="hidden" name="REFERER" value="<?=$this->REFERER?>"/>
|
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
<button type="submit" class="btn btn-primary">Powrót</button>
|
|
|
</form>
|
|
</form>
|
|
|
</div>
|
|
</div>
|
|
@@ -912,168 +960,4 @@ EOT;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public function reinstallAction() {
|
|
|
|
|
- $this->reinstall();
|
|
|
|
|
- die('OK');
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- public function reinstall() {
|
|
|
|
|
- $sqlList = array();
|
|
|
|
|
-/* $sqlList['InstallLayerTable'] = <<<SQL
|
|
|
|
|
-CREATE TABLE IF NOT EXISTS `WMS_LAYERS` (
|
|
|
|
|
- `ID` int(11) NOT NULL AUTO_INCREMENT,
|
|
|
|
|
- `the_geom` polygon NOT NULL,
|
|
|
|
|
- `ID_PROJECT` int(11) NOT NULL,
|
|
|
|
|
- `LAYER_NAME` varchar(100) NOT NULL,
|
|
|
|
|
- `LAYER_TYPE` enum('GeoTIFF','QGIS') NOT NULL DEFAULT 'GeoTIFF',
|
|
|
|
|
- `OLD_LAYER_TYPE` enum('GeoTIFF','QGIS') NOT NULL,
|
|
|
|
|
- `LAYER_DESC` text NOT NULL,
|
|
|
|
|
- `ID_WMS_MAPS` int(11) NOT NULL,
|
|
|
|
|
- `OLD_ID_WMS_MAPS` int(11) NOT NULL,
|
|
|
|
|
- `FILE_NAME` varchar(255) NOT NULL,
|
|
|
|
|
- `FILE_STATUS` enum('NONE','TO_GENERATE','IN_PROGRESS','GENERATED','ERROR') NOT NULL DEFAULT 'NONE',
|
|
|
|
|
- `FILE_STATUS_INFO` varchar(255) NOT NULL,
|
|
|
|
|
- `EPSG` int(11) NOT NULL,
|
|
|
|
|
- `EXTENT` varchar(100) NOT NULL,
|
|
|
|
|
- `MAP_STATUS` enum('ACTIVE','INACTIVE') NOT NULL DEFAULT 'INACTIVE',
|
|
|
|
|
- `FILE_MD5` varchar(32) NOT NULL,
|
|
|
|
|
- `A_RECORD_CREATE_DATE` datetime NOT NULL,
|
|
|
|
|
- `A_RECORD_CREATE_AUTHOR` varchar(40) NOT NULL,
|
|
|
|
|
- `A_RECORD_UPDATE_DATE` varchar(18) NOT NULL,
|
|
|
|
|
- `A_RECORD_UPDATE_AUTHOR` varchar(40) NOT NULL,
|
|
|
|
|
- `L_APPOITMENT_DATE` datetime NOT NULL,
|
|
|
|
|
- `L_APPOITMENT_USER` varchar(40) NOT NULL,
|
|
|
|
|
- `L_APPOITMENT_PERIOD` varchar(30) NOT NULL,
|
|
|
|
|
- `L_APPOITMENT_INFO` varchar(200) NOT NULL,
|
|
|
|
|
- `L_APPOITMENT_TYPE` enum('','ARRANGED','TO_ARRANGE','CANCELLED','TO_CANCEL','RELATE','WAIT') NOT NULL,
|
|
|
|
|
- `A_PROBLEM` enum('','WARNING','PROBLEM','SERIOUS','UNVERIFIED') NOT NULL,
|
|
|
|
|
- `A_PROBLEM_DESC` varchar(200) NOT NULL,
|
|
|
|
|
- `A_PROBLEM_DATE` datetime NOT NULL,
|
|
|
|
|
- `A_STATUS` enum('DELETED','MONITOR','NORMAL','OFF_HARD','OFF_SOFT','WAITING','WARNING') NOT NULL DEFAULT 'WAITING',
|
|
|
|
|
- `A_STATUS_INFO` varchar(100) NOT NULL,
|
|
|
|
|
- `A_STATUS_LASTCHANGE_DATE` datetime NOT NULL,
|
|
|
|
|
- `A_ADM_COMPANY` varchar(100) NOT NULL,
|
|
|
|
|
- `A_CLASSIFIED` varchar(100) NOT NULL,
|
|
|
|
|
- `SYNC_SQIX_STATUS` varchar(100) NOT NULL,
|
|
|
|
|
- PRIMARY KEY (`ID`)
|
|
|
|
|
-) ENGINE=MyISAM DEFAULT CHARSET=latin2;
|
|
|
|
|
-SQL;
|
|
|
|
|
-
|
|
|
|
|
- $sqlList['InstallLayerHistTable'] = <<<SQL
|
|
|
|
|
-CREATE TABLE IF NOT EXISTS `WMS_LAYERS_HIST` (
|
|
|
|
|
- `ID` int(11) NOT NULL AUTO_INCREMENT,
|
|
|
|
|
- `ID_USERS2` int(11) NOT NULL,
|
|
|
|
|
- `the_geom` text,
|
|
|
|
|
- `ID_PROJECT` varchar(20) DEFAULT 'N/S;',
|
|
|
|
|
- `LAYER_NAME` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- `LAYER_TYPE` varchar(10) DEFAULT 'N/S;',
|
|
|
|
|
- `OLD_LAYER_TYPE` varchar(10) DEFAULT 'N/S;',
|
|
|
|
|
- `LAYER_DESC` varchar(10000) DEFAULT 'N/S;',
|
|
|
|
|
- `ID_WMS_MAPS` varchar(20) DEFAULT 'N/S;',
|
|
|
|
|
- `OLD_ID_WMS_MAPS` varchar(20) DEFAULT 'N/S;',
|
|
|
|
|
- `FILE_NAME` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `FILE_STATUS` varchar(20) DEFAULT 'N/S;',
|
|
|
|
|
- `FILE_STATUS_INFO` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `EPSG` varchar(10) DEFAULT 'N/S;',
|
|
|
|
|
- `EXTENT` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- `MAP_STATUS` varchar(20) DEFAULT 'N/S;',
|
|
|
|
|
- `FILE_MD5` varchar(32) DEFAULT 'N/S;',
|
|
|
|
|
- `A_RECORD_CREATE_DATE` varchar(30) DEFAULT 'N/S;',
|
|
|
|
|
- `A_RECORD_CREATE_AUTHOR` varchar(40) DEFAULT 'N/S;',
|
|
|
|
|
- `A_RECORD_UPDATE_DATE` varchar(18) DEFAULT 'N/S;',
|
|
|
|
|
- `A_RECORD_UPDATE_AUTHOR` varchar(40) DEFAULT 'N/S;',
|
|
|
|
|
- `L_APPOITMENT_DATE` varchar(30) DEFAULT 'N/S;',
|
|
|
|
|
- `L_APPOITMENT_USER` varchar(40) DEFAULT 'N/S;',
|
|
|
|
|
- `L_APPOITMENT_PERIOD` varchar(30) DEFAULT 'N/S;',
|
|
|
|
|
- `L_APPOITMENT_INFO` varchar(200) DEFAULT 'N/S;',
|
|
|
|
|
- `L_APPOITMENT_TYPE` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `A_PROBLEM` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `A_PROBLEM_DESC` varchar(200) DEFAULT 'N/S;',
|
|
|
|
|
- `A_PROBLEM_DATE` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `A_STATUS` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `A_STATUS_INFO` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- `A_STATUS_LASTCHANGE_DATE` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `A_ADM_COMPANY` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- `A_CLASSIFIED` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- `SYNC_SQIX_STATUS` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- PRIMARY KEY (`ID`)
|
|
|
|
|
-) ENGINE=MyISAM DEFAULT CHARSET=latin2;
|
|
|
|
|
-SQL;
|
|
|
|
|
-
|
|
|
|
|
- $sqlList['InstallMapTable'] = <<<SQL
|
|
|
|
|
-CREATE TABLE IF NOT EXISTS `WMS_MAPS` (
|
|
|
|
|
- `ID` int(11) NOT NULL AUTO_INCREMENT,
|
|
|
|
|
- `MAP_NAME` varchar(100) NOT NULL,
|
|
|
|
|
- `MAP_DESC` text NOT NULL,
|
|
|
|
|
- `MAP_STATUS` enum('NONE','TO_GENERATE','IN_PROGRESS','GENERATED','ERROR') NOT NULL DEFAULT 'NONE',
|
|
|
|
|
- `MAP_STATUS_INFO` varchar(255) NOT NULL,
|
|
|
|
|
- `MAP_URL` varchar(100) NOT NULL,
|
|
|
|
|
- `MAP_FILE` varchar(100) NOT NULL,
|
|
|
|
|
- `A_RECORD_CREATE_DATE` datetime NOT NULL,
|
|
|
|
|
- `A_RECORD_CREATE_AUTHOR` varchar(40) NOT NULL,
|
|
|
|
|
- `A_RECORD_UPDATE_DATE` varchar(18) NOT NULL,
|
|
|
|
|
- `A_RECORD_UPDATE_AUTHOR` varchar(40) NOT NULL,
|
|
|
|
|
- `L_APPOITMENT_DATE` datetime NOT NULL,
|
|
|
|
|
- `L_APPOITMENT_USER` varchar(40) NOT NULL,
|
|
|
|
|
- `L_APPOITMENT_PERIOD` varchar(30) NOT NULL,
|
|
|
|
|
- `L_APPOITMENT_INFO` varchar(200) NOT NULL,
|
|
|
|
|
- `L_APPOITMENT_TYPE` enum('','ARRANGED','TO_ARRANGE','CANCELLED','TO_CANCEL','RELATE','WAIT') NOT NULL,
|
|
|
|
|
- `A_PROBLEM` enum('','WARNING','PROBLEM','SERIOUS','UNVERIFIED') NOT NULL,
|
|
|
|
|
- `A_PROBLEM_DESC` varchar(200) NOT NULL,
|
|
|
|
|
- `A_PROBLEM_DATE` datetime NOT NULL,
|
|
|
|
|
- `A_STATUS` enum('DELETED','MONITOR','NORMAL','OFF_HARD','OFF_SOFT','WAITING','WARNING') NOT NULL DEFAULT 'WAITING',
|
|
|
|
|
- `A_STATUS_INFO` varchar(100) NOT NULL,
|
|
|
|
|
- `A_STATUS_LASTCHANGE_DATE` datetime NOT NULL,
|
|
|
|
|
- `A_ADM_COMPANY` varchar(100) NOT NULL,
|
|
|
|
|
- `A_CLASSIFIED` varchar(100) NOT NULL,
|
|
|
|
|
- `SYNC_SQIX_STATUS` varchar(100) NOT NULL,
|
|
|
|
|
- PRIMARY KEY (`ID`)
|
|
|
|
|
-) ENGINE=MyISAM DEFAULT CHARSET=latin2;
|
|
|
|
|
-SQL;
|
|
|
|
|
-
|
|
|
|
|
- $sqlList['InstallMapHistTable'] = <<<SQL
|
|
|
|
|
-CREATE TABLE IF NOT EXISTS `WMS_MAPS_HIST` (
|
|
|
|
|
- `ID` int(11) NOT NULL AUTO_INCREMENT,
|
|
|
|
|
- `ID_USERS2` int(11) NOT NULL,
|
|
|
|
|
- `MAP_NAME` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- `MAP_DESC` varchar(10000) NOT NULL DEFAULT 'N/S;',
|
|
|
|
|
- `MAP_STATUS` varchar(20) NOT NULL DEFAULT 'N/S;',
|
|
|
|
|
- `MAP_STATUS_INFO` varchar(255) NOT NULL DEFAULT 'N/S;',
|
|
|
|
|
- `MAP_URL` varchar(100) NOT NULL DEFAULT 'N/S;',
|
|
|
|
|
- `MAP_FILE` varchar(100) NOT NULL DEFAULT 'N/S;',
|
|
|
|
|
- `A_RECORD_CREATE_DATE` varchar(30) DEFAULT 'N/S;',
|
|
|
|
|
- `A_RECORD_CREATE_AUTHOR` varchar(40) DEFAULT 'N/S;',
|
|
|
|
|
- `A_RECORD_UPDATE_DATE` varchar(18) DEFAULT 'N/S;',
|
|
|
|
|
- `A_RECORD_UPDATE_AUTHOR` varchar(40) DEFAULT 'N/S;',
|
|
|
|
|
- `L_APPOITMENT_DATE` varchar(30) DEFAULT 'N/S;',
|
|
|
|
|
- `L_APPOITMENT_USER` varchar(40) DEFAULT 'N/S;',
|
|
|
|
|
- `L_APPOITMENT_PERIOD` varchar(30) DEFAULT 'N/S;',
|
|
|
|
|
- `L_APPOITMENT_INFO` varchar(200) DEFAULT 'N/S;',
|
|
|
|
|
- `L_APPOITMENT_TYPE` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `A_PROBLEM` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `A_PROBLEM_DESC` varchar(200) DEFAULT 'N/S;',
|
|
|
|
|
- `A_PROBLEM_DATE` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `A_STATUS` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `A_STATUS_INFO` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- `A_STATUS_LASTCHANGE_DATE` varchar(255) DEFAULT 'N/S;',
|
|
|
|
|
- `A_ADM_COMPANY` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- `A_CLASSIFIED` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- `SYNC_SQIX_STATUS` varchar(100) DEFAULT 'N/S;',
|
|
|
|
|
- PRIMARY KEY (`ID`)
|
|
|
|
|
-) ENGINE=MyISAM DEFAULT CHARSET=latin2;
|
|
|
|
|
-SQL;
|
|
|
|
|
-*/
|
|
|
|
|
- $db = DB::getDB();
|
|
|
|
|
- if ($db->has_errors()) {
|
|
|
|
|
- throw new Exception("DB Errors: " . implode("\n<br>", $db->get_errors()));
|
|
|
|
|
- }
|
|
|
|
|
- foreach ($sqlList as $sqlName => $sql) {
|
|
|
|
|
- $res = $db->query($sql);
|
|
|
|
|
- if ($db->has_errors()) {
|
|
|
|
|
- throw new Exception("DB Errors at sql '{$sqlName}': " . implode("\n<br>", $db->get_errors()));
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|