Piotr Labudda 9 лет назад
Родитель
Сommit
1a3ad3a1fa

+ 33 - 1
SE/se-lib/Route/UrlAction/UserProNetMediaZaliczka.php

@@ -37,6 +37,12 @@ class Route_UrlAction_UserProNetMediaZaliczka extends RouteBase {// TODO: UrlAct
 			if (!$data['idZaliczka']) {
 				$this->zaliczkaListaView($data);
 			} else {
+				UI::startContainer();
+				UI::tag('a', [
+					'href' => "index.php?_route=UrlAction_UserProNetMediaZaliczka&idUser={$data['idUser']}",
+					'class' => "btn btn-link"
+				], "<i class=\"glyphicon glyphicon-arrow-left\"></i> wróć");
+				UI::endContainer();
 				$this->zaliczkaFormView($data);
 			}
 		} catch (Exception $e) {
@@ -141,7 +147,33 @@ class Route_UrlAction_UserProNetMediaZaliczka extends RouteBase {// TODO: UrlAct
 			UI::emptyTag('input', ['type'=>"submit", 'value'=>"Dodaj nową zaliczkę", 'class'=>'btn btn-primary']);
 		UI::endTag('form');
 
-		UI::alert('danger', "TODO: lista zaliczek");
+		UI::table([
+			'caption' => "Zaliczki:",
+			'rows' => array_map(
+				function ($row) use ($idUser) {
+					static $isFirst = true;
+					$editLink = Request::getPathUri() . "index.php?_route=UrlAction_UserProNetMediaZaliczka&idUser={$idUser}&idZaliczka={$row['ID']}";
+					$editLabel = ($isFirst) ? "Rozlicz / Podgląd" : "Podgląd";
+					if ($isFirst) $isFirst = false;
+					return [
+						'Nr' => $row['ID'],
+						'Status' => $row['A_STATUS'],
+						'L_APPOITMENT_USER' => $row['L_APPOITMENT_USER'],
+						'KWOTA' => $row['KWOTA'],
+						'NIEROZLICZONA_KWOTA' => $row['NIEROZLICZONA_KWOTA'],
+						'#' => '<a href="' . $editLink . '">' . $editLabel . '</a>'
+					];
+				},
+				DB::getPDO()->fetchAll("
+					select z.*
+					from ZALICZKA z
+						join ADMIN_USERS u on(z.L_APPOITMENT_USER = u.ADM_ACCOUNT and u.ID = {$idUser})
+					order by z.ID DESC
+				")
+			),
+			'empty_msg' => "Brak",
+			'disable_lp' => true,
+		]);
 		UI::alert('danger', "TODO: pierwsza na liście - aktualna - btn(Rozlicz)");// -> Edycja zaliczki
 
 		UI::endContainer();

+ 6 - 2
SE/se-lib/Schema/DefaultDb/zaliczka/ZaliczkaStorageAcl.php

@@ -125,9 +125,12 @@ class Schema_DefaultDb_zaliczka_ZaliczkaStorageAcl extends Core_AclSimpleSchemaB
       DBG::nicePrint($userSaldo, '$userSaldo');// TODO: DBG
     }
 
+    $usrLogin = User::getLogin();
     $execRet = DB::getPDO()->exec("
-      insert into `ZALICZKA` (L_APPOITMENT_USER, NIEROZLICZONA_KWOTA)
-        select u.ADM_ACCOUNT, '{$userSaldo}'
+      insert into `ZALICZKA` (A_RECORD_CREATE_AUTHOR, A_RECORD_CREATE_DATE
+          , L_APPOITMENT_USER, NIEROZLICZONA_KWOTA)
+        select '{$usrLogin}' as A_RECORD_CREATE_AUTHOR, NOW() as A_RECORD_CREATE_DATE
+          , u.ADM_ACCOUNT, '{$userSaldo}'
         from ADMIN_USERS u
         where u.ID = {$idUser}
     ");
@@ -137,6 +140,7 @@ class Schema_DefaultDb_zaliczka_ZaliczkaStorageAcl extends Core_AclSimpleSchemaB
 
     $this->insertRef('worker', $id, $idUser);
 
+    // TODO: legacy fill table ZALICZKA_HIST
     DB::getPDO()->exec("
       insert into `ZALICZKA_HIST` (ID_USERS2, L_APPOITMENT_USER, NIEROZLICZONA_KWOTA)
         select z.ID as ID_USERS2, z.L_APPOITMENT_USER, z.NIEROZLICZONA_KWOTA