rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish version/v.0.0.82

Browse Source
This commit is contained in:
Roland Schneider 2016-07-30 20:11:18 +02:00
commit ad3ab64d8e
3 changed files with 318 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
backend/controllers/CardPackageController.php
View File

@ -21,7 +21,8 @@ use common\components\Upload;
/**
* CardPackageController implements the CRUD actions for CardPackage model.
*/
class CardPackageController extends \backend\controllers\BackendController {
class CardPackageController extends \backend\controllers\BackendController
{
public function behaviors()
@ -32,28 +33,30 @@ class CardPackageController extends \backend\controllers\BackendController {
'rules' => [
// allow authenticated users
[
'actions' => ['create','index','view','import','download'],
'actions' => ['create', 'index', 'view', 'import', 'download'],
'allow' => true,
'roles' => ['admin','employee','reception'],
'roles' => ['admin', 'employee', 'reception'],
],
// everything else is denied
],
],
];
}
/**
* Lists all CardPackage models.
*
* @return mixed
*/
public function actionIndex() {
public function actionIndex()
{
$searchModel = new CardPackageSearch ();
$dataProvider = $searchModel->search ( Yii::$app->request->queryParams );
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
return $this->render ( 'index', [
return $this->render('index', [
'searchModel' => $searchModel,
'dataProvider' => $dataProvider
] );
]);
}
/**
@ -62,45 +65,48 @@ class CardPackageController extends \backend\controllers\BackendController {
* @param integer $id
* @return mixed
*/
public function actionView($id) {
$model = $this->findModel ( $id );
public function actionView($id)
{
$model = $this->findModel($id);
$query = Card::find ();
$query->innerJoin ( "card_card_package_assignment", "card_card_package_assignment.id_card = card.id_card " );
$query->andWhere ( [
$query = Card::find();
$query->innerJoin("card_card_package_assignment", "card_card_package_assignment.id_card = card.id_card ");
$query->andWhere([
'card_card_package_assignment.id_card_package' => $id
] );
]);
$dataProvider = new ActiveDataProvider ( [
$dataProvider = new ActiveDataProvider ([
'query' => $query
] );
]);
return $this->render ( 'view', [
return $this->render('view', [
'model' => $model,
'dataProvider' => $dataProvider
] );
]);
}
public function actionDownload($id) {
$model = $this->findModel ( $id );
$model->updateCounters ( [
public function actionDownload($id)
{
$model = $this->findModel($id);
$model->updateCounters([
'printed' => 1
] );
]);
$query = Card::find ();
$query->innerJoin ( "card_card_package_assignment", "card_card_package_assignment.id_card = card.id_card " );
$query->andWhere ( [
$query = Card::find();
$query->innerJoin("card_card_package_assignment", "card_card_package_assignment.id_card = card.id_card ");
$query->andWhere([
'card_card_package_assignment.id_card_package' => $id
] );
]);
$cards = $query->all ();
$cards = $query->all();
$numbers = [ ];
foreach ( $cards as $card ) {
$numbers = [];
foreach ($cards as $card) {
$numbers [] = $card->number;
}
$this->generateXLS ( $model, $numbers );
$this->generateXLS($model, $numbers);
}
/**
@ -109,64 +115,67 @@ class CardPackageController extends \backend\controllers\BackendController {
*
* @return mixed
*/
public function actionCreate() {
public function actionCreate()
{
$model = new CardPackage ();
$model->id_user = \Yii::$app->user->id;
$model->printed = 0;
if ($model->load ( Yii::$app->request->post () ) && $model->validate ()) {
if ($model->load(Yii::$app->request->post()) && $model->validate()) {
$conn = \Yii::$app->db;
$tx = $conn->beginTransaction ();
$tx = $conn->beginTransaction();
$model->save ( false );
$model->save(false);
$count = $model->count;
$numGen = new FreeUniqueCardNumberGenerator ( [
$numGen = new FreeUniqueCardNumberGenerator ([
'count' => $model->count,
'prefix' => '10'
] );
]);
$numGen->generate ();
$numGen->generate();
$numbers = $numGen->cache;
try {
foreach ( $numbers as $number ) {
foreach ($numbers as $number) {
$card = new Card ();
$card->number = $number;
$card->type = Card::TYPE_RFID;
$card->status = Card::STATUS_ACTIVE;
$card->save ( false );
$card->save(false);
$cardAssignment = new CardCardPackageAssignment ();
$cardAssignment->id_card = $card->id_card;
$cardAssignment->id_card_package = $model->id_card_package;
$cardAssignment->save ( false );
$cardAssignment->save(false);
}
$tx->commit ();
$tx->commit();
return $this->redirect ( [
return $this->redirect([
'index'
] );
} catch ( \Exception $e ) {
$tx->rollBack ();
]);
} catch (\Exception $e) {
$tx->rollBack();
}
return $this->render ( 'create', [
return $this->render('create', [
'model' => $model
] );
]);
} else {
return $this->render ( 'create', [
return $this->render('create', [
'model' => $model
] );
]);
}
}
protected function generateXLS($model, $numbers) {
protected function generateXLS($model, $numbers)
{
$objPHPExcel = new \PHPExcel ();
$sheet = $objPHPExcel->setActiveSheetIndex ( 0 );
$sheet = $objPHPExcel->setActiveSheetIndex(0);
// $row = 1;
// $sheet->setCellValue('A'.$row, "Termék név")
@ -176,48 +185,49 @@ class CardPackageController extends \backend\controllers\BackendController {
// ->setCellValue('E'.$row, "Eladás összege");
$row = 0;
foreach ( $numbers as $number ) {
$row ++;
$sheet->setCellValue ( 'A' . $row, $number );
foreach ($numbers as $number) {
$row++;
$sheet->setCellValue('A' . $row, $number);
}
$fileName = "kartya_csomag";
$fileName .= "_" . $model->id_card_package;
$fileName .= "_" . date ( "Ymd_His" );
$fileName .= "_" . date("Ymd_His");
$fileName .= ".xls";
// Redirect output to a client’s web browser (Excel5)
header ( 'Content-Type: application/vnd.ms-excel' );
header ( 'Content-Disposition: attachment;filename="' . $fileName . '"' );
header ( 'Cache-Control: max-age=0' );
header('Content-Type: application/vnd.ms-excel');
header('Content-Disposition: attachment;filename="' . $fileName . '"');
header('Cache-Control: max-age=0');
// If you're serving to IE 9, then the following may be needed
header ( 'Cache-Control: max-age=1' );
header('Cache-Control: max-age=1');
// If you're serving to IE over SSL, then the following may be needed
header ( 'Expires: Mon, 26 Jul 1997 05:00:00 GMT' ); // Date in the past
header ( 'Last-Modified: ' . gmdate ( 'D, d M Y H:i:s' ) . ' GMT' ); // always modified
header ( 'Cache-Control: cache, must-revalidate' ); // HTTP/1.1
header ( 'Pragma: public' ); // HTTP/1.0
$objWriter = \PHPExcel_IOFactory::createWriter ( $objPHPExcel, 'Excel5' );
$objWriter->save ( 'php://output' );
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
header('Cache-Control: cache, must-revalidate'); // HTTP/1.1
header('Pragma: public'); // HTTP/1.0
$objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
$objWriter->save('php://output');
exit ();
}
public function actionImport() {
public function actionImport()
{
$model = new CardPackageImportForm ();
if (Yii::$app->request->isPost) {
$model->file = UploadedFile::getInstance ( $model, 'file' );
$model->file = UploadedFile::getInstance($model, 'file');
if ($model->validate ()) {
if ($model->validate()) {
// print_r($model->file);
// $model->message = "ok";
$file = $model->file->tempName;
$xlsUtil = new XLSUtil ();
$xlsUtil->loadFromFileName ( $file );
$array = $xlsUtil->toArray ();
$xlsUtil->loadFromFileName($file);
$array = $xlsUtil->toArray();
// print_r($array);
// print_r( array_column($array, 2));
@ -226,44 +236,55 @@ class CardPackageController extends \backend\controllers\BackendController {
// echo $item[2];
// }
foreach ( $array as $row ) {
foreach ($array as $row) {
try {
$tx = \Yii::$app->db->beginTransaction ();
$tx = \Yii::$app->db->beginTransaction();
$card = Card::find ()->andWhere ( [
$rfidIsValid = false;
$rfid = $row[2];
if (isset($rfid) && !empty($rfid) && strlen($rfid) > 8) {
$rfidIsValid = true;
}
if ( !$rfidIsValid ){
throw new \Exception("Rfid is invalid");
}
$card = Card::find()->andWhere([
'number' => $row [0]
] )->one ();
])->one();
if ( isset( $card )) {
$card->rfid_key = Helper::fixAsciiChars( $row [2 ] );
if (isset($card)) {
$card->rfid_key = Helper::fixAsciiChars($row [2]);
$card->save(false);
}else{
} else {
throw new \Exception("Card not found");
}
$tx->commit ();
$tx->commit();
$model->done = $model->done + 1;
} catch ( \Exception $e ) {
$tx->rollBack ();
} catch (\Exception $e) {
$tx->rollBack();
$model->failed = $model->failed + 1;
\Yii::error ( "Failed to import card rfid: " . print_r ( $row, true ) );
\Yii::error("Failed to import card rfid: " . print_r($row, true));
}
}
\Yii::$app->session->setFlash ( 'success', "Az importálás eredménye: sikeres:" . $model->done . "; Sikertelen: " . $model->failed );
\Yii::$app->session->setFlash('success', "Az importálás eredménye: sikeres:" . $model->done . "; Sikertelen: " . $model->failed);
\Yii::info('Importálás: sikeres: ' .$model->done . " , sikertelen: " . $model->failed);
return $this->redirect ( [
\Yii::info('Importálás: sikeres: ' . $model->done . " , sikertelen: " . $model->failed);
return $this->redirect([
'card-package/import'
] );
]);
}
}
return $this->render ( "import", [
return $this->render("import", [
'model' => $model
] );
]);
}
/**
@ -273,18 +294,19 @@ class CardPackageController extends \backend\controllers\BackendController {
* @param integer $id
* @return mixed
*/
public function actionUpdate($id) {
$model = $this->findModel ( $id );
public function actionUpdate($id)
{
$model = $this->findModel($id);
if ($model->load ( Yii::$app->request->post () ) && $model->save ()) {
return $this->redirect ( [
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect([
'view',
'id' => $model->id_card_package
] );
]);
} else {
return $this->render ( 'update', [
return $this->render('update', [
'model' => $model
] );
]);
}
}
@ -295,12 +317,13 @@ class CardPackageController extends \backend\controllers\BackendController {
* @param integer $id
* @return mixed
*/
public function actionDelete($id) {
$this->findModel ( $id )->delete ();
public function actionDelete($id)
{
$this->findModel($id)->delete();
return $this->redirect ( [
return $this->redirect([
'index'
] );
]);
}
/**
@ -311,11 +334,12 @@ class CardPackageController extends \backend\controllers\BackendController {
* @return CardPackage the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
protected function findModel($id) {
if (($model = CardPackage::findOne ( $id )) !== null) {
protected function findModel($id)
{
if (($model = CardPackage::findOne($id)) !== null) {
return $model;
} else {
throw new NotFoundHttpException ( 'The requested page does not exist.' );
throw new NotFoundHttpException ('The requested page does not exist.');
}
}
}

2
changelog.txt
View File

@ -1,3 +1,5 @@
-0.0.82
- add rfid check to card package import
-0.0.81
- add comment to transaction/index
-0.0.80

2
common/config/params.php
View File

@ -5,7 +5,7 @@ return [
'supportEmail' => 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600,
'version' => 'v0.0.81',
'version' => 'v0.0.82',
'company' => 'movar',//gyor
'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global