From 4aa17e5210363b240b06445e18e4b1fbcd41880b Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Fri, 19 Feb 2016 21:33:06 +0100 Subject: [PATCH 1/2] Add key controller to add/update keys , add bakcend skin param --- backend/config/main.php | 3 -- backend/controllers/KeyController.php | 49 ++++++++++++++++++++++----- backend/views/key/import.php | 18 +++++++++- backend/views/layouts/content.php | 1 - backend/views/layouts/header.php | 3 +- backend/views/layouts/main.php | 3 +- common/components/Helper.php | 7 ++++ common/config/params.php | 5 +-- common/models/Key.php | 2 ++ frontend/models/KeyToggleForm.php | 11 +++++- 10 files changed, 83 insertions(+), 19 deletions(-) diff --git a/backend/config/main.php b/backend/config/main.php index 92646c9..7a2e2e4 100644 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -32,9 +32,6 @@ return [ 'session' => [ 'name' => '_backendSessionId', // unique for backend 'savePath' => __DIR__ . '/../runtime', // a temporary folder on backend - 'cookieParams' => [ - 'path' => '/backend/web', - ], ], 'log' => [ 'traceLevel' => YII_DEBUG ? 3 : 0, diff --git a/backend/controllers/KeyController.php b/backend/controllers/KeyController.php index 847401b..6c4aaa4 100644 --- a/backend/controllers/KeyController.php +++ b/backend/controllers/KeyController.php @@ -33,7 +33,7 @@ class KeyController extends Controller { 'rules' => [ // allow authenticated users [ - 'actions' => ['create','index','view','update'], + 'actions' => ['create','index','view','update','import'], 'allow' => true, 'roles' => ['admin','employee','reception'], ], @@ -156,10 +156,18 @@ class KeyController extends Controller { public function actionImport() { $model = new KeyImportForm(); $arr = [ ]; + $updated = 0; + $inserted = 0; + $failed = 0; + $found = 0; if (Yii::$app->request->isPost) { + + $model->file = UploadedFile::getInstance ( $model, 'file' ); + if ( isset($model->file)){ + // print_r($model->file); // $model->message = "ok"; $file = $model->file->tempName; @@ -191,25 +199,48 @@ class KeyController extends Controller { $arr [] = $item; } } + $found = count($arr); foreach ( $arr as $item ) { try { - $key = new Key (); - $key->number = $item ['number']; - $key->rfid_key = $item ['key']; - $key->status = Key::STATUS_ACTIVE; - $key->type = Key::TYPE_NORMAL; - $key->save ( false ); + $key = Key::findOne(['number' => $item ['number']]); + if ( !isset($key)){ + $key = new Key (); + $key->number = $item ['number']; + $key->rfid_key = $item ['key']; + $key->status = Key::STATUS_ACTIVE; + $key->type = Key::TYPE_NORMAL; + $key->save ( false ); + $inserted++; + }else{ + $key->rfid_key = $item['key']; + $key->update(false); + $updated++; + } } catch ( \Exception $e ) { \Yii::error ( "Failed to save key: " . $key->number ); + $failed++; + } } + $message = "Fájlnév: " . $model->file->name; + $message .= "
Fájlból beolvasva: $found "; + $message .= "
Új kulcs sikeresen importálva: $inserted "; + $message .= "
Rendszerben lévő kulcs sikeresen módosítva: $updated "; + $message .= "
Sikertelen kulcs importálás/módosítás: $failed "; + \Yii::$app->session->setFlash('success',$message); - $this->redirect ( [ + $model->message = $message; + + \Yii::$app->session->set('mymessage',$model->message); + + return $this->redirect ( [ 'import' ] ); + } } - + $model->message = \Yii::$app->session->get('mymessage'); + \Yii::$app->session->remove('mymessage'); return $this->render ( 'import', [ 'model' => $model ] ); diff --git a/backend/views/key/import.php b/backend/views/key/import.php index b4f5923..99d2705 100644 --- a/backend/views/key/import.php +++ b/backend/views/key/import.php @@ -9,8 +9,24 @@ use yii\helpers\Html; message); + if ( isset($model->message)){ + ?> +
+
+ +
Importálás összegzése
+
+ message;?> + +
+
+ + + + \ No newline at end of file diff --git a/backend/views/layouts/content.php b/backend/views/layouts/content.php index f4c502f..7dca653 100644 --- a/backend/views/layouts/content.php +++ b/backend/views/layouts/content.php @@ -1,6 +1,5 @@ diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php index 9eb7bf3..0d41688 100644 --- a/backend/views/layouts/header.php +++ b/backend/views/layouts/header.php @@ -1,5 +1,6 @@
- Adminisztráció + Adminisztráció
diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php index a0b545e..f53b374 100644 --- a/backend/views/layouts/main.php +++ b/backend/views/layouts/main.php @@ -1,5 +1,6 @@ controller->action->id === 'login') { } - + beginBody() ?>
diff --git a/common/components/Helper.php b/common/components/Helper.php index 593ad7b..2fd8139 100644 --- a/common/components/Helper.php +++ b/common/components/Helper.php @@ -256,9 +256,16 @@ class Helper { return \Yii::$app->params ['user_cart_item_visibility'] == 'user'; } + public static function getBackendSkin() { + return \Yii::$app->params ['backend_skin'] ; + } + public static function getCompany() { return \Yii::$app->params ['company'] ; } + public static function getCompanyName() { + return \Yii::$app->params ['company_name'] ; + } public static function isCompanyMovar() { return \Yii::$app->params ['company'] == 'movar'; diff --git a/common/config/params.php b/common/config/params.php index a349dfa..26b4391 100644 --- a/common/config/params.php +++ b/common/config/params.php @@ -17,7 +17,7 @@ return [ 'login_admin_email' => true, //if admin login should send email 'account_state_close_preload_money' => 'true',//preload money wnen show account state close page 'ugiro_duplom_kod' => 1, - 'ugiro_kezdemenyezo_szamlaszam' => '5860025215371128', + 'ugiro_kezdemenyezo_szamlaszam' => '000000000000000',//5860025215371128 'ugiro_kezdemenyezo_azonosito' => 'A25366936T244', //a recepicó kosár csak az aktuális user által kiadott termékeket tartalmazza //vagy mindent @@ -26,5 +26,6 @@ return [ /** * Hány napig láthatják visszamenőleg a recepciósok az adatokat * */ - 'reception_visibility_days' => 3 + 'reception_visibility_days' => 3, + 'backend_skin' => 'skin-red', //skin-green ]; diff --git a/common/models/Key.php b/common/models/Key.php index 74c09a8..a7d9445 100644 --- a/common/models/Key.php +++ b/common/models/Key.php @@ -94,6 +94,8 @@ class Key extends \yii\db\ActiveRecord return $result; } + + /** * @param yii\db\Query $query * */ diff --git a/frontend/models/KeyToggleForm.php b/frontend/models/KeyToggleForm.php index 2b845d2..43efd5f 100644 --- a/frontend/models/KeyToggleForm.php +++ b/frontend/models/KeyToggleForm.php @@ -41,7 +41,16 @@ class KeyToggleForm extends Model } public function toggleKey(){ - $this->keyModel = Key::find()->andWhere(['rfid_key' => $this->key])->one(); + $query= Key::find(); + + $query->andWhere(['or', + ['and',[ 'in','key.number' , [$this->key]],"trim(coalesce(key.number, '')) <>'' " ], + ['and', ['in','key.rfid_key' ,[ $this->key ] ],"trim(coalesce(key.rfid_key, '')) <>'' "], + + ]); + + $this->keyModel = $query->one(); + if ( isset($this->keyModel) ){ $assignments = CardKeyAssignment::find()->andWhere(['id_key' => $this->keyModel->id_key])->all(); if ( count($assignments) > 0){ From a36da9a3c99b0d95acf0929d7262847a4489517e Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Fri, 19 Feb 2016 21:35:46 +0100 Subject: [PATCH 2/2] change version to 0.0.38 --- changelog.txt | 3 +++ common/config/params.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 5087be4..6a41bb9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +-0.0.38 + - add backend skin + - add import add/edit to key -0.0.37 - fix backend user acces - fix sell product account will not anymore changed diff --git a/common/config/params.php b/common/config/params.php index 26b4391..4127063 100644 --- a/common/config/params.php +++ b/common/config/params.php @@ -4,7 +4,7 @@ return [ 'supportEmail' => 'rocho02@gmail.com', 'infoEmail' => 'info@rocho-net.hu', 'user.passwordResetTokenExpire' => 3600, - 'version' => 'v0.0.37', + 'version' => 'v0.0.38', 'company' => 'movar',//gyor 'company_name' => "Freimann Kft.", 'product_visiblity' => 'account',// on reception which products to display. account or global