Skip to content

Commit ad150cd

Browse files
rodriguez90rodriguez90
committed
Start testin sp from sybase
Fix Bug: refactor reception permission to process permission
1 parent 52e6306 commit ad150cd

9 files changed

+245
-65
lines changed

‎commands/RbacController.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function actionInit()
102102
$user_perm = ["admin_mod" => "Acceso al modulo administrción","user_create" => "Crear Usuario", "user_update" => "Actualizar Usuarios", "user_delete" => "Eliminar Usuarios", "user_list" => "Listar Usuarios", "user_view" => "Ver Usuarios"];
103103
$warehouse_perm = ["warehouse_create"=>"Crear Depósito", "warehouse_update"=>"Actualizar Depósito", "warehouse_delete" => "Eliminar Depósito", "warehouse_list"=>"Listar Depósito", "warehouse_view"=>"Detalle Depósito"];
104104
$calendar_perm = ["calendar_create"=>"Crear calendario", "calendar_update"=>"Actualizar calendario", "calendar_delete"=>"Eliminar calendario", "calendar_list"=>"Listar calendario", "calendar_view"=>"Detalle de calendario"];
105-
$reception_perm = ["reception_create"=>"Crear recepción", "reception_update"=>"Actualizar recepción", "reception_delete"=>"", "reception_list"=>"", "reception_view"=>""];
105+
$process_perm = ["process_create"=>"Crear recepción", "process_update"=>"Actualizar recepción", "process_delete"=>"", "process_list"=>"", "process_view"=>""];
106106
$agency_perm = ["agency_create"=>"", "agency_update"=>"", "agency_delete"=>"", "agency_list"=>"", "agency_view"=>""];
107107
$ticket_perm = ["ticket_create"=>"", "ticket_update"=>"", "ticket_delete"=>"", "ticket_list"=>"", "ticket_view"=>""];
108108
$transcompany_perm = ["trans_company_create"=>"", "trans_company_update"=>"", "trans_company_delete"=>"", "trans_company_list"=>"", "trans_company_view"=>""];
@@ -112,7 +112,7 @@ public function actionInit()
112112
$admin_perm [0] = $user_perm;
113113
$admin_perm [1] = $warehouse_perm;
114114
$admin_perm [2] = $calendar_perm;
115-
$admin_perm [3] = $reception_perm;
115+
$admin_perm [3] = $process_perm;
116116
$admin_perm [4] = $agency_perm;
117117
$admin_perm [5] = $ticket_perm;
118118
$admin_perm [6] = $transcompany_perm;
@@ -216,7 +216,7 @@ public function actionOn(){
216216
$user_perm = ["admin_mod" => "Acceso al modulo administrción","user_create" => "Crear Usuario", "user_update" => "Actualizar Usuarios", "user_delete" => "Eliminar Usuarios", "user_list" => "Listar Usuarios", "user_view" => "Ver Usuarios"];
217217
$warehouse_perm = ["warehouse_create"=>"Crear Depósito", "warehouse_update"=>"Actualizar Depósito", "warehouse_delete" => "Eliminar Depósito", "warehouse_list"=>"Listar Depósito", "warehouse_view"=>"Detalle Depósito"];
218218
$calendar_perm = ["calendar_create"=>"Crear calendario", "calendar_update"=>"Actualizar calendario", "calendar_delete"=>"Eliminar calendario", "calendar_list"=>"Listar calendario", "calendar_view"=>"Detalle de calendario"];
219-
$reception_perm = ["reception_create"=>"Crear recepción", "reception_update"=>"Actualizar recepción", "reception_delete"=>"", "reception_list"=>"", "reception_view"=>""];
219+
$process_perm = ["process_create"=>"Crear recepción", "process_update"=>"Actualizar recepción", "process_delete"=>"", "process_list"=>"", "process_view"=>""];
220220
$agency_perm = ["agency_create"=>"", "agency_update"=>"", "agency_delete"=>"", "agency_list"=>"", "agency_view"=>""];
221221
$ticket_perm = ["ticket_create"=>"", "ticket_update"=>"", "ticket_delete"=>"", "ticket_list"=>"", "ticket_view"=>""];
222222
$transcompany_perm = ["trans_company_create"=>"", "trans_company_update"=>"", "trans_company_delete"=>"", "trans_company_list"=>"", "trans_company_view"=>""];
@@ -227,7 +227,7 @@ public function actionOn(){
227227
$admin_perm [0] = $user_perm;
228228
$admin_perm [1] = $warehouse_perm;
229229
$admin_perm [2] = $calendar_perm;
230-
$admin_perm [3] = $reception_perm;
230+
$admin_perm [3] = $process_perm;
231231
$admin_perm [4] = $agency_perm;
232232
$admin_perm [5] = $ticket_perm;
233233
$admin_perm [6] = $transcompany_perm;
@@ -267,7 +267,7 @@ public function actionOn(){
267267
$ok = $ok && $auth->add($pemiso);
268268
}
269269
270-
foreach ($reception_perm as $key => $desc) {
270+
foreach ($process_perm as $key => $desc) {
271271
$pemiso = $auth->createPermission($key);
272272
$pemiso->description = $desc;
273273
echo "6.5";

‎config/db.php

+7-17
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
$port = "7100";
88
$user = "xedrux";
99
$password = "xedrux";
10-
10+
//
1111
//return [
1212
// 'class' => 'yii\db\Connection',
1313
// 'driverName' => 'sybase',
1414
// 'schemaMap' => [
1515
// 'sybase' => \websightnl\yii2\sybase\Schema::className(),
1616
// ],
17-
// 'dsn' => 'odbc:sgt_xedrux',
18-
//// 'dsn' => 'odbc:xedrux',
17+
//// 'dsn' => 'odbc:sgt_xedrux',
18+
// 'dsn' => 'odbc:xedrux_64',
1919
// 'username' => $user,
2020
// 'password' => $password,
2121
//];
@@ -28,14 +28,8 @@
2828
// 'schemaMap' => [
2929
// 'sybase' => \websightnl\yii2\sybase\Schema::className(),
3030
// ],
31-
// //'dsn' => 'odbc:host=190.63.174.169;port=7100;dbname=sgt',
32-
// //'dsn' => 'odbc:DRIVER={Adaptive Server Anywhere 7.0};SERVER=190.63.174.169;PORT=7100;DATABASE=sgt;UID=xedrux;PWD=xedrux',
33-
// //'dsn' => 'odbc:Driver=Adaptive Server Anywhere 7.0;ENG=190.63.174.169.sgt;UID=xedrux;PWD=xedrux;DBN=sgt;LINKS=TCPIP(HOST=190.63.174.169:7100);',
34-
// //'dsn' => 'odbc:Driver={Adaptive Server Enterprise};app=sgt;server=190.63.174.169;port=7100;db=sgt;uid=xedrux;pwd=xedrux;',
35-
// 'dsn' => 'odbc:Driver={Adaptive Server Enterprise};NA=190.63.174.169,7100;Uid=xedrux;Pwd=xedrux;',
36-
//// 'dsn' => 'odbc:Driver={SYBASE ASE ODBC Driver};NA=190.63.174.169,7100;Uid=xedrux;Pwd=xedrux;',
37-
// //'dsn' => 'odbc:Driver={SQL Anywhere 12};Server=189902;CommLinks=tcpip(Host=1.2.3.4);',
38-
// //'dsn' => 'odbc:host=190.63.174.169;port=7100;dbname=sgt',
31+
// //'dsn' => 'odbc:Driver={SYBASE ASE ODBC Driver};NA=190.63.174.169,7100;Uid=xedrux;Pwd=xedrux;',
32+
// 'dsn' => 'odbc:Driver={Adaptive Server Enterprise};app=SGT;server=190.63.174.169;port=7100;db=sgt;uid=xedrux;pwd=xedrux;',
3933
// 'username' => 'xedrux',
4034
// 'password' => 'xedrux',
4135
// //'charset' => 'utf8',
@@ -48,14 +42,10 @@
4842

4943
return [
5044
'class' => 'yii\db\Connection',
51-
// 'dsn'=>'odbc:Server=PEDRO-PC\SQLEXPRESS;Database=sgt',
52-
// 'dsn'=>'sqlsrv:Server=PEDRO-PC\SQLEXPRESS;Database=sgt',
53-
// 'dsn'=>'sybase:Server=190.63.174.169:7100;Database=sgt',
45+
'dsn'=>'sqlsrv:Server=PEDRO-PC\SQLEXPRESS;Database=sgt',
5446
// sqlsrv:Server=WIN-FV2H1LSOO63\SQLEXPRESS;Database=sgt
55-
'dsn'=>'sqlsrv:Server=DESKTOP-JH5RE76\SQLEXPRESS;Database=sgt',
56-
// 'username' => $user,
47+
// 'dsn'=>'sqlsrv:Server=DESKTOP-JH5RE76\SQLEXPRESS;Database=sgt',
5748
'username' => '',
58-
// 'password' => $password, //Root*2018
5949
'password' => '', //Root*2018
6050
'charset' => 'utf8',
6151

‎config/web.php

+10-5
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,17 @@
9494
'dateFormat' => 'dd/MM/yyyy',
9595
],
9696
],
97+
// 'modules' => [
98+
// 'rd' => 'app\modules\rd\RD',
99+
// 'administracion' => 'app\modules\administracion\Administracion',
100+
// ],
97101
'modules' => [
98-
'rd' => 'app\modules\rd\RD',
99-
'administracion' => 'app\modules\administracion\Administracion',
100-
// 'administracion' => [
101-
// 'class' => 'app\modules\administracion\Administracion',
102-
// ],
102+
'rd' => [
103+
'class' => 'app\modules\rd\RD',
104+
],
105+
'administracion' => [
106+
'class' => 'app\modules\administracion\Administracion',
107+
],
103108
],
104109
'params' => $params,
105110
];

‎controllers/SiteController.php

+30-13
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use app\modules\rd\models\UserAgency;
1616
use app\modules\rd\models\UserTranscompany;
1717

18+
use app\modules\rd\models\Warehouse;
1819
use DateTime;
1920
use DateTimeZone;
2021

@@ -85,23 +86,39 @@ public function actions()
8586
*/
8687
public function actionIndex()
8788
{
88-
// $agencia = Agency::findOne(['name'=>new Expression("CONVERT(varchar, 'aaaa')")]);
89-
// var_dump($agencia);//die;
89+
// $w = Warehouse::find()->all();
90+
// var_dump($w);die;
91+
// $w = new Warehouse();
9092
//
91-
// $agency = new Agency();
92-
// $agency->name = "aaaa";
93-
// $agency->code_oce = "aaaa";
94-
// $agency->ruc = "aaaaaaaaaaaa";
95-
// $agency->active = 1;
96-
// $result = $agency->save();
97-
// if($result === false)
93+
// $w->name = 'Test';
94+
// $w->code_oce = 'aaaa';
95+
// $w->ruc = '1111111111111';
96+
// $w->active = 1;
97+
// if (!$w->save())
98+
// {
99+
// var_dump($w->getFirstErrors());
100+
// }
101+
// else
98102
// {
99-
// var_dump(implode(" ", $agency->getErrorSummary(false)));
103+
// var_dump($w->id);
100104
// }
101-
////
102105
// die;
103-
////
104-
////// $agencia = Agency::findOne(['id'=>new Expression("CONVERT(integer, 1)")]);
106+
//
107+
// $agencia = new Agency();
108+
// $agencia->name = 'Test';
109+
// $agencia->code_oce = 'aaaa';
110+
// $agencia->ruc = 'adsasdasdasdasd';
111+
// $agencia->active = 1;
112+
// if (!$agencia->save())
113+
// {
114+
// var_dump($agencia->getFirstErrors());
115+
// }
116+
// else
117+
// {
118+
// var_dump($agencia->id);
119+
// }
120+
//
121+
//// $agencia = Agency::findOne(['id'=>new Expression("CONVERT(integer, 1)")]);
105122
// $agencia = Agency::findOne(['name'=>new Expression("CONVERT(varchar, 'aaaa')")]);
106123
// var_dump($agencia);die;
107124
// $agencia->name = 'YEESSSSS!!!!';

‎modules/rd/controllers/ContainerController.php

+31
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Yii;
66
use app\modules\rd\models\Container;
77
use app\modules\rd\models\ContainerSearch;
8+
use yii\db\Command;
89
use yii\web\Controller;
910
use yii\web\NotFoundHttpException;
1011
use yii\web\ForbiddenHttpException;
@@ -137,6 +138,36 @@ public function actionDelete($id)
137138
return $this->redirect(['index']);
138139
}
139140

141+
public function actionSP()
142+
{
143+
Yii::$app->response->format = Response::FORMAT_JSON;
144+
145+
$response = array();
146+
$response['success'] = true;
147+
$response['containers'] = [];
148+
$response['msg'] = '';
149+
$response['msg_dev'] = '';
150+
151+
$bl = Yii::$app->request->get('bl');
152+
153+
if(!isset($bl))
154+
{
155+
$response['success'] = false;
156+
$response['msg'] = "Debe especificar el código de búsqueda.";
157+
}
158+
159+
if($response['success'])
160+
{
161+
$result = \Yii::$app->db->createCommand("exec sp_sgt_bl_cons(:bl)")
162+
->bindValue(':bl' , $bl )
163+
->execute();
164+
165+
var_dump($result);die;
166+
}
167+
168+
return $response;
169+
}
170+
140171
/**
141172
* Finds the Container model based on its primary key value.
142173
* If the model is not found, a 404 HTTP exception will be thrown.

‎modules/rd/controllers/ProcessController.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function behaviors()
8686
*/
8787
public function actionView($id)
8888
{
89-
if(!Yii::$app->user->can("reception_view")) // FIXME: change permission to process_view
89+
if(!Yii::$app->user->can("process_view")) // FIXME: change permission to process_view
9090
throw new ForbiddenHttpException('Usted no tiene acceso a esta recepción');
9191

9292
$model = $this->findModel($id);
@@ -141,7 +141,7 @@ public function actionCreate($type)
141141
if((int)$type !== Process::PROCESS_IMPORT && (int)$type !== Process::PROCESS_EXPORT)
142142
throw new ForbiddenHttpException('Error en el tipo de solicitud.');
143143

144-
// if(!Yii::$app->user->can("reception_create"))
144+
// if(!Yii::$app->user->can("process_create"))
145145
// throw new ForbiddenHttpException('Usted no tiene permiso para crear un proceso');
146146

147147
$model = new Process();
@@ -174,7 +174,7 @@ public function actionCreate($type)
174174
*/
175175
public function actionUpdate($id)
176176
{
177-
if(!Yii::$app->user->can("reception_update"))
177+
if(!Yii::$app->user->can("process_update"))
178178
throw new ForbiddenHttpException('Usted no tiene permiso para crear una recepción');
179179

180180
$model = $this->findModel($id);
@@ -197,7 +197,7 @@ public function actionUpdate($id)
197197
*/
198198
public function actionDelete($id)
199199
{
200-
if(!Yii::$app->user->can("reception_delete"))
200+
if(!Yii::$app->user->can("process_delete"))
201201
throw new ForbiddenHttpException('Usted no tiene permiso para eliminar esta recepción');
202202

203203

@@ -224,7 +224,7 @@ protected function findModel($id)
224224

225225
public function actionContainers()
226226
{
227-
if(!Yii::$app->user->can("reception_list"))
227+
if(!Yii::$app->user->can("process_list"))
228228
throw new ForbiddenHttpException('Usted no tiene permiso para crear una recepción');
229229

230230
Yii::$app->response->format = Response::FORMAT_JSON;
@@ -253,7 +253,7 @@ public function actionContainers()
253253

254254
public function actionTransactions()
255255
{
256-
if(!Yii::$app->user->can("reception_list"))
256+
if(!Yii::$app->user->can("process_list"))
257257
throw new ForbiddenHttpException('Usted no tiene permiso para crear una recepción');
258258

259259
Yii::$app->response->format = Response::FORMAT_JSON;
@@ -630,7 +630,7 @@ public function actionGeneratingcard(){
630630
}
631631

632632
public function actionPrint($id){
633-
if(!Yii::$app->user->can("reception_view")) // FIXME: change permission to process_view
633+
if(!Yii::$app->user->can("process_view")) // FIXME: change permission to process_view
634634
throw new ForbiddenHttpException('Usted no tiene acceso a esta recepción');
635635

636636
$model = $this->findModel($id);

‎modules/rd/controllers/TicketController.php

+41
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,47 @@ public function actionMyCalendar()
564564
]);
565565
}
566566

567+
public function actionSPTicketNotification($ticket)
568+
{
569+
570+
571+
Yii::$app->response->format = Response::FORMAT_JSON;
572+
573+
$response = array();
574+
$response['success'] = true;
575+
$response['drivers'] = [];
576+
$response['msg'] = '';
577+
$response['msg_dev'] = '';
578+
579+
if(!isset($ticket))
580+
{
581+
$response['success'] = false;
582+
$response['msg'] = "Debe especificar el código de búsqueda.";
583+
}
584+
585+
if($response['success'])
586+
{
587+
//5.- Crear registro de permiso para poder ingresar por garitas
588+
//Este es el sp que se ejecuta cuando asignas el turno y nos notificas su creación.
589+
//
590+
//Recibe como parametro
591+
//@tipo_mov varchar(5) -- IMPO o EXPO (depende del proceso que está haciendo)
592+
//@placa varchar(10)
593+
//@cedula varchar(15)
594+
//@contenedor varchar(11)
595+
//@fecha_turno varchar(16) --Formato -> 2018/06/19 17:05
596+
//@usuario
597+
//
598+
//Ej: //exec sp_sgt_access_ins 'IMPO','GRY4606','0925564304','ABCD1234567','2018/06/19 17:05','desa2'
599+
$result = \Yii::$app->db->createCommand("exec sp_sgt_access_ins(:tipo_mov, :placa, :cedula, :contenedor, :fecha_turno)")
600+
->execute();
601+
602+
var_dump($result);die;
603+
}
604+
605+
return $response;
606+
}
607+
567608
public function actionShedule()
568609
{
569610
Yii::$app->response->format = Response::FORMAT_JSON;

0 commit comments

Comments
 (0)