From 1b088402df215561a8f8c4bc5e53dd0c4436ca16 Mon Sep 17 00:00:00 2001 From: SoHardKI Date: Fri, 21 Jun 2019 18:05:58 +0300 Subject: [PATCH 1/3] add_balance --- .bowerrc | 0 .gitignore | 0 .htaccess | 0 LICENSE.md | 0 README.md | 0 Vagrantfile | 0 backend/assets/AppAsset.php | 0 backend/codeception.yml | 0 backend/config/.gitignore | 0 backend/config/bootstrap.php | 0 backend/config/main.php | 3 + backend/config/params.php | 0 backend/config/test.php | 0 backend/controllers/SiteController.php | 0 backend/models/.gitkeep | 0 backend/modules/balance/Balance.php | 24 +++++ .../balance/controllers/BalanceController.php | 80 ++++++++++++++++ backend/modules/balance/models/Balance.php | 48 ++++++++++ .../modules/balance/models/BalanceSearch.php | 30 ++++++ .../modules/balance/views/balance/_form.php | 85 +++++++++++++++++ .../modules/balance/views/balance/create.php | 18 ++++ .../modules/balance/views/balance/index.php | 30 ++++++ .../modules/balance/views/balance/update.php | 19 ++++ .../modules/balance/views/balance/view.php | 35 +++++++ backend/modules/card/Card.php | 0 .../card/controllers/UserCardController.php | 0 backend/modules/card/models/UserCard.php | 0 .../modules/card/models/UserCardSearch.php | 0 .../modules/card/views/user-card/_form.php | 0 .../modules/card/views/user-card/_search.php | 0 .../modules/card/views/user-card/create.php | 0 .../modules/card/views/user-card/index.php | 0 .../modules/card/views/user-card/update.php | 0 backend/modules/card/views/user-card/view.php | 0 backend/modules/company/Company.php | 0 .../company/controllers/CompanyController.php | 0 backend/modules/company/models/Company.php | 0 .../modules/company/models/CompanySearch.php | 0 .../modules/company/views/company/_form.php | 0 .../modules/company/views/company/_search.php | 0 .../modules/company/views/company/create.php | 0 .../modules/company/views/company/index.php | 0 .../modules/company/views/company/update.php | 0 .../modules/company/views/company/view.php | 0 backend/modules/hh/Hh.php | 0 .../hh/controllers/DefaultController.php | 0 .../modules/hh/controllers/HhController.php | 0 .../hh/controllers/HhJobController.php | 0 backend/modules/hh/models/Hh.php | 0 backend/modules/hh/models/HhJob.php | 0 backend/modules/hh/models/HhJobSearch.php | 0 backend/modules/hh/models/HhSearch.php | 0 backend/modules/hh/views/default/index.php | 0 backend/modules/hh/views/hh-job/_form.php | 0 backend/modules/hh/views/hh-job/_search.php | 0 backend/modules/hh/views/hh-job/create.php | 0 backend/modules/hh/views/hh-job/index.php | 0 backend/modules/hh/views/hh-job/update.php | 0 backend/modules/hh/views/hh-job/view.php | 0 backend/modules/hh/views/hh/_form.php | 0 backend/modules/hh/views/hh/_search.php | 0 backend/modules/hh/views/hh/create.php | 0 backend/modules/hh/views/hh/index.php | 0 backend/modules/hh/views/hh/update.php | 0 backend/modules/hh/views/hh/view.php | 0 backend/modules/project/Project.php | 0 .../project/controllers/ProjectController.php | 0 backend/modules/project/models/Project.php | 0 .../modules/project/models/ProjectSearch.php | 0 .../modules/project/views/project/_form.php | 0 .../modules/project/views/project/_search.php | 0 .../modules/project/views/project/create.php | 0 .../modules/project/views/project/index.php | 0 .../modules/project/views/project/update.php | 0 .../modules/project/views/project/view.php | 0 backend/modules/settings/Settings.php | 0 .../AdditionalFieldsController.php | 0 .../controllers/PositionController.php | 0 .../settings/controllers/SkillController.php | 0 .../settings/controllers/StatusController.php | 0 .../settings/models/AdditionalFields.php | 0 .../models/AdditionalFieldsSearch.php | 0 backend/modules/settings/models/Position.php | 0 .../settings/models/PositionSearch.php | 0 backend/modules/settings/models/Skill.php | 0 .../modules/settings/models/SkillSearch.php | 0 backend/modules/settings/models/Status.php | 0 .../modules/settings/models/StatusSearch.php | 0 .../views/additional-fields/_form.php | 0 .../views/additional-fields/_search.php | 0 .../views/additional-fields/create.php | 0 .../views/additional-fields/index.php | 0 .../views/additional-fields/update.php | 0 .../settings/views/additional-fields/view.php | 0 .../modules/settings/views/position/_form.php | 0 .../settings/views/position/_search.php | 0 .../settings/views/position/create.php | 0 .../modules/settings/views/position/index.php | 0 .../settings/views/position/update.php | 0 .../modules/settings/views/position/view.php | 0 .../modules/settings/views/skill/_form.php | 0 .../modules/settings/views/skill/_search.php | 0 .../modules/settings/views/skill/create.php | 0 .../modules/settings/views/skill/index.php | 0 .../modules/settings/views/skill/update.php | 0 backend/modules/settings/views/skill/view.php | 0 .../modules/settings/views/status/_form.php | 0 .../modules/settings/views/status/_search.php | 0 .../modules/settings/views/status/create.php | 0 .../modules/settings/views/status/index.php | 0 .../modules/settings/views/status/update.php | 0 .../modules/settings/views/status/view.php | 0 backend/runtime/.gitignore | 0 backend/tests/_bootstrap.php | 0 backend/tests/_data/.gitignore | 0 backend/tests/_data/login_data.php | 0 backend/tests/_output/.gitignore | 0 backend/tests/_support/.gitignore | 0 backend/tests/_support/FunctionalTester.php | 0 backend/tests/_support/UnitTester.php | 0 backend/tests/functional.suite.yml | 0 backend/tests/functional/LoginCest.php | 0 backend/tests/functional/_bootstrap.php | 0 backend/tests/unit.suite.yml | 0 backend/tests/unit/_bootstrap.php | 0 backend/views/layouts/content.php | 0 backend/views/layouts/header.php | 0 backend/views/layouts/left.php | 3 +- backend/views/layouts/main-login.php | 0 backend/views/layouts/main.php | 0 backend/views/site/error.php | 0 backend/views/site/index.php | 0 backend/views/site/login.php | 0 backend/web/.gitignore | 0 backend/web/.htaccess | 0 backend/web/assets/.gitignore | 0 backend/web/css/site.css | 0 backend/web/favicon.ico | Bin codeception.yml | 0 common/classes/Debug.php | 0 common/codeception.yml | 0 common/config/.gitignore | 0 common/config/bootstrap.php | 0 common/config/main.php | 0 common/config/params.php | 0 common/config/test.php | 0 common/fixtures/UserFixture.php | 0 common/hhapi/.gitignore | 0 common/hhapi/composer.json | 0 common/hhapi/core/lib/Company.php | 0 common/hhapi/core/lib/Vacancy.php | 0 common/hhapi/core/request/Request.php | 0 common/hhapi/core/service/HHService.php | 0 common/hhapi/index.php | 0 common/mail/layouts/html.php | 0 common/mail/layouts/text.php | 0 common/mail/passwordResetToken-html.php | 0 common/mail/passwordResetToken-text.php | 0 common/models/AdditionalFields.php | 0 common/models/Balance.php | 45 +++++++++ common/models/CardSkill.php | 0 common/models/Company.php | 0 common/models/FieldsValue.php | 3 +- common/models/Hh.php | 0 common/models/HhJob.php | 0 common/models/LoginForm.php | 0 common/models/Position.php | 0 common/models/Project.php | 0 common/models/ProjectUser.php | 0 common/models/Skill.php | 0 common/models/Status.php | 0 common/models/UseField.php | 4 +- common/models/UseStatus.php | 4 +- common/models/User.php | 0 common/models/UserCard.php | 0 common/tests/_bootstrap.php | 0 common/tests/_data/user.php | 0 common/tests/_output/.gitignore | 0 common/tests/_support/.gitignore | 0 common/tests/_support/UnitTester.php | 0 common/tests/unit.suite.yml | 0 common/tests/unit/models/LoginFormTest.php | 0 common/widgets/Alert.php | 0 composer.json | 3 +- composer.lock | 88 ++++++++++++++---- console/config/.gitignore | 0 console/config/bootstrap.php | 0 console/config/main.php | 0 console/config/params.php | 0 console/controllers/.gitkeep | 0 console/migrations/m130524_201442_init.php | 0 .../m181003_070416_create_status_table.php | 0 .../m181003_070636_create_user_card_table.php | 0 ..._082730_create_additional_fields_table.php | 0 ...81003_092319_create_fields_value_table.php | 0 ...7_add_column_resume_to_user_card_table.php | 0 ...add_column_order_to_fields_value_table.php | 0 ...m181005_114117_create_use_status_table.php | 0 .../m181008_065248_create_use_field_table.php | 0 .../m181008_090446_create_project_table.php | 0 ...3_add_project_id_field_to_fields_value.php | 0 ...81008_105959_create_project_user_table.php | 0 .../m181011_140628_create_company_table.php | 0 ...1011_140904_add_column_to_fields_value.php | 0 ...m181011_142555_add_column_to_user_card.php | 0 ...add_column_company_id_to_project_table.php | 0 .../m181012_082916_create_position_table.php | 0 ..._position_id_column_to_user_card_table.php | 0 .../m181012_102422_create_skill_table.php | 0 ...d_deleted_at_column_to_user_card_table.php | 0 .../m181121_103329_create_hh_table.php | 0 .../m181121_112940_create_hh_job_table.php | 0 ...5329_add_hh_id_column_to_project_table.php | 0 ...57_add_schedule_column_to_hh_job_table.php | 0 .../migrations/m190621_094843_add_balance.php | 45 +++++++++ console/models/.gitkeep | 0 console/runtime/.gitignore | 0 .../dev/backend/config/main-local.php | 0 .../dev/backend/config/params-local.php | 0 .../dev/backend/config/test-local.php | 0 environments/dev/backend/web/index-test.php | 0 environments/dev/backend/web/index.php | 0 environments/dev/backend/web/robots.txt | 0 environments/dev/common/config/main-local.php | 0 .../dev/common/config/params-local.php | 0 environments/dev/common/config/test-local.php | 0 .../dev/console/config/main-local.php | 0 .../dev/console/config/params-local.php | 0 .../dev/frontend/config/main-local.php | 0 .../dev/frontend/config/params-local.php | 0 .../dev/frontend/config/test-local.php | 0 environments/dev/frontend/web/index-test.php | 0 environments/dev/frontend/web/index.php | 0 environments/dev/frontend/web/robots.txt | 0 environments/dev/yii | 0 environments/dev/yii_test | 0 environments/dev/yii_test.bat | 0 environments/index.php | 0 .../prod/backend/config/main-local.php | 0 .../prod/backend/config/params-local.php | 0 environments/prod/backend/web/index.php | 0 environments/prod/backend/web/robots.txt | 0 .../prod/common/config/main-local.php | 0 .../prod/common/config/params-local.php | 0 .../prod/console/config/main-local.php | 0 .../prod/console/config/params-local.php | 0 .../prod/frontend/config/main-local.php | 0 .../prod/frontend/config/params-local.php | 0 environments/prod/frontend/web/index.php | 0 environments/prod/frontend/web/robots.txt | 0 environments/prod/yii | 0 frontend/assets/AppAsset.php | 0 frontend/codeception.yml | 0 frontend/config/.gitignore | 0 frontend/config/bootstrap.php | 0 frontend/config/main.php | 1 + frontend/config/params.php | 0 frontend/config/test.php | 0 frontend/controllers/SiteController.php | 0 frontend/models/ContactForm.php | 0 frontend/models/PasswordResetRequestForm.php | 0 frontend/models/ResetPasswordForm.php | 0 frontend/models/SignupForm.php | 0 frontend/runtime/.gitignore | 0 frontend/tests/_bootstrap.php | 0 frontend/tests/_data/login_data.php | 0 frontend/tests/_data/user.php | 0 frontend/tests/_output/.gitignore | 0 frontend/tests/_support/.gitignore | 0 frontend/tests/_support/FunctionalTester.php | 0 frontend/tests/_support/UnitTester.php | 0 frontend/tests/acceptance.suite.yml.example | 0 frontend/tests/acceptance/HomeCest.php | 0 frontend/tests/acceptance/_bootstrap.php | 0 frontend/tests/functional.suite.yml | 0 frontend/tests/functional/AboutCest.php | 0 frontend/tests/functional/ContactCest.php | 0 frontend/tests/functional/HomeCest.php | 0 frontend/tests/functional/LoginCest.php | 0 frontend/tests/functional/SignupCest.php | 0 frontend/tests/functional/_bootstrap.php | 0 frontend/tests/unit.suite.yml | 0 frontend/tests/unit/_bootstrap.php | 0 .../tests/unit/models/ContactFormTest.php | 0 .../models/PasswordResetRequestFormTest.php | 0 .../unit/models/ResetPasswordFormTest.php | 0 frontend/tests/unit/models/SignupFormTest.php | 0 frontend/views/layouts/main.php | 0 frontend/views/site/about.php | 0 frontend/views/site/contact.php | 0 frontend/views/site/error.php | 0 frontend/views/site/index.php | 0 frontend/views/site/login.php | 0 .../views/site/requestPasswordResetToken.php | 0 frontend/views/site/resetPassword.php | 0 frontend/views/site/signup.php | 0 frontend/web/.gitignore | 0 frontend/web/.htaccess | 0 frontend/web/assets/.gitignore | 0 frontend/web/css/site.css | 0 frontend/web/favicon.ico | Bin frontend/web/media/upload/.gitignore | 0 init.bat | 0 requirements.php | 0 vagrant/config/.gitignore | 0 vagrant/config/vagrant-local.example.yml | 0 vagrant/nginx/app.conf | 0 vagrant/nginx/log/.gitignore | 0 vagrant/provision/always-as-root.sh | 0 vagrant/provision/common.sh | 0 vagrant/provision/once-as-root.sh | 0 vagrant/provision/once-as-vagrant.sh | 0 yii.bat | 0 313 files changed, 543 insertions(+), 25 deletions(-) mode change 100644 => 100755 .bowerrc mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .htaccess mode change 100644 => 100755 LICENSE.md mode change 100644 => 100755 README.md mode change 100644 => 100755 Vagrantfile mode change 100644 => 100755 backend/assets/AppAsset.php mode change 100644 => 100755 backend/codeception.yml mode change 100644 => 100755 backend/config/.gitignore mode change 100644 => 100755 backend/config/bootstrap.php mode change 100644 => 100755 backend/config/main.php mode change 100644 => 100755 backend/config/params.php mode change 100644 => 100755 backend/config/test.php mode change 100644 => 100755 backend/controllers/SiteController.php mode change 100644 => 100755 backend/models/.gitkeep create mode 100644 backend/modules/balance/Balance.php create mode 100644 backend/modules/balance/controllers/BalanceController.php create mode 100644 backend/modules/balance/models/Balance.php create mode 100644 backend/modules/balance/models/BalanceSearch.php create mode 100644 backend/modules/balance/views/balance/_form.php create mode 100644 backend/modules/balance/views/balance/create.php create mode 100644 backend/modules/balance/views/balance/index.php create mode 100644 backend/modules/balance/views/balance/update.php create mode 100644 backend/modules/balance/views/balance/view.php mode change 100644 => 100755 backend/modules/card/Card.php mode change 100644 => 100755 backend/modules/card/controllers/UserCardController.php mode change 100644 => 100755 backend/modules/card/models/UserCard.php mode change 100644 => 100755 backend/modules/card/models/UserCardSearch.php mode change 100644 => 100755 backend/modules/card/views/user-card/_form.php mode change 100644 => 100755 backend/modules/card/views/user-card/_search.php mode change 100644 => 100755 backend/modules/card/views/user-card/create.php mode change 100644 => 100755 backend/modules/card/views/user-card/index.php mode change 100644 => 100755 backend/modules/card/views/user-card/update.php mode change 100644 => 100755 backend/modules/card/views/user-card/view.php mode change 100644 => 100755 backend/modules/company/Company.php mode change 100644 => 100755 backend/modules/company/controllers/CompanyController.php mode change 100644 => 100755 backend/modules/company/models/Company.php mode change 100644 => 100755 backend/modules/company/models/CompanySearch.php mode change 100644 => 100755 backend/modules/company/views/company/_form.php mode change 100644 => 100755 backend/modules/company/views/company/_search.php mode change 100644 => 100755 backend/modules/company/views/company/create.php mode change 100644 => 100755 backend/modules/company/views/company/index.php mode change 100644 => 100755 backend/modules/company/views/company/update.php mode change 100644 => 100755 backend/modules/company/views/company/view.php mode change 100644 => 100755 backend/modules/hh/Hh.php mode change 100644 => 100755 backend/modules/hh/controllers/DefaultController.php mode change 100644 => 100755 backend/modules/hh/controllers/HhController.php mode change 100644 => 100755 backend/modules/hh/controllers/HhJobController.php mode change 100644 => 100755 backend/modules/hh/models/Hh.php mode change 100644 => 100755 backend/modules/hh/models/HhJob.php mode change 100644 => 100755 backend/modules/hh/models/HhJobSearch.php mode change 100644 => 100755 backend/modules/hh/models/HhSearch.php mode change 100644 => 100755 backend/modules/hh/views/default/index.php mode change 100644 => 100755 backend/modules/hh/views/hh-job/_form.php mode change 100644 => 100755 backend/modules/hh/views/hh-job/_search.php mode change 100644 => 100755 backend/modules/hh/views/hh-job/create.php mode change 100644 => 100755 backend/modules/hh/views/hh-job/index.php mode change 100644 => 100755 backend/modules/hh/views/hh-job/update.php mode change 100644 => 100755 backend/modules/hh/views/hh-job/view.php mode change 100644 => 100755 backend/modules/hh/views/hh/_form.php mode change 100644 => 100755 backend/modules/hh/views/hh/_search.php mode change 100644 => 100755 backend/modules/hh/views/hh/create.php mode change 100644 => 100755 backend/modules/hh/views/hh/index.php mode change 100644 => 100755 backend/modules/hh/views/hh/update.php mode change 100644 => 100755 backend/modules/hh/views/hh/view.php mode change 100644 => 100755 backend/modules/project/Project.php mode change 100644 => 100755 backend/modules/project/controllers/ProjectController.php mode change 100644 => 100755 backend/modules/project/models/Project.php mode change 100644 => 100755 backend/modules/project/models/ProjectSearch.php mode change 100644 => 100755 backend/modules/project/views/project/_form.php mode change 100644 => 100755 backend/modules/project/views/project/_search.php mode change 100644 => 100755 backend/modules/project/views/project/create.php mode change 100644 => 100755 backend/modules/project/views/project/index.php mode change 100644 => 100755 backend/modules/project/views/project/update.php mode change 100644 => 100755 backend/modules/project/views/project/view.php mode change 100644 => 100755 backend/modules/settings/Settings.php mode change 100644 => 100755 backend/modules/settings/controllers/AdditionalFieldsController.php mode change 100644 => 100755 backend/modules/settings/controllers/PositionController.php mode change 100644 => 100755 backend/modules/settings/controllers/SkillController.php mode change 100644 => 100755 backend/modules/settings/controllers/StatusController.php mode change 100644 => 100755 backend/modules/settings/models/AdditionalFields.php mode change 100644 => 100755 backend/modules/settings/models/AdditionalFieldsSearch.php mode change 100644 => 100755 backend/modules/settings/models/Position.php mode change 100644 => 100755 backend/modules/settings/models/PositionSearch.php mode change 100644 => 100755 backend/modules/settings/models/Skill.php mode change 100644 => 100755 backend/modules/settings/models/SkillSearch.php mode change 100644 => 100755 backend/modules/settings/models/Status.php mode change 100644 => 100755 backend/modules/settings/models/StatusSearch.php mode change 100644 => 100755 backend/modules/settings/views/additional-fields/_form.php mode change 100644 => 100755 backend/modules/settings/views/additional-fields/_search.php mode change 100644 => 100755 backend/modules/settings/views/additional-fields/create.php mode change 100644 => 100755 backend/modules/settings/views/additional-fields/index.php mode change 100644 => 100755 backend/modules/settings/views/additional-fields/update.php mode change 100644 => 100755 backend/modules/settings/views/additional-fields/view.php mode change 100644 => 100755 backend/modules/settings/views/position/_form.php mode change 100644 => 100755 backend/modules/settings/views/position/_search.php mode change 100644 => 100755 backend/modules/settings/views/position/create.php mode change 100644 => 100755 backend/modules/settings/views/position/index.php mode change 100644 => 100755 backend/modules/settings/views/position/update.php mode change 100644 => 100755 backend/modules/settings/views/position/view.php mode change 100644 => 100755 backend/modules/settings/views/skill/_form.php mode change 100644 => 100755 backend/modules/settings/views/skill/_search.php mode change 100644 => 100755 backend/modules/settings/views/skill/create.php mode change 100644 => 100755 backend/modules/settings/views/skill/index.php mode change 100644 => 100755 backend/modules/settings/views/skill/update.php mode change 100644 => 100755 backend/modules/settings/views/skill/view.php mode change 100644 => 100755 backend/modules/settings/views/status/_form.php mode change 100644 => 100755 backend/modules/settings/views/status/_search.php mode change 100644 => 100755 backend/modules/settings/views/status/create.php mode change 100644 => 100755 backend/modules/settings/views/status/index.php mode change 100644 => 100755 backend/modules/settings/views/status/update.php mode change 100644 => 100755 backend/modules/settings/views/status/view.php mode change 100644 => 100755 backend/runtime/.gitignore mode change 100644 => 100755 backend/tests/_bootstrap.php mode change 100644 => 100755 backend/tests/_data/.gitignore mode change 100644 => 100755 backend/tests/_data/login_data.php mode change 100644 => 100755 backend/tests/_output/.gitignore mode change 100644 => 100755 backend/tests/_support/.gitignore mode change 100644 => 100755 backend/tests/_support/FunctionalTester.php mode change 100644 => 100755 backend/tests/_support/UnitTester.php mode change 100644 => 100755 backend/tests/functional.suite.yml mode change 100644 => 100755 backend/tests/functional/LoginCest.php mode change 100644 => 100755 backend/tests/functional/_bootstrap.php mode change 100644 => 100755 backend/tests/unit.suite.yml mode change 100644 => 100755 backend/tests/unit/_bootstrap.php mode change 100644 => 100755 backend/views/layouts/content.php mode change 100644 => 100755 backend/views/layouts/header.php mode change 100644 => 100755 backend/views/layouts/left.php mode change 100644 => 100755 backend/views/layouts/main-login.php mode change 100644 => 100755 backend/views/layouts/main.php mode change 100644 => 100755 backend/views/site/error.php mode change 100644 => 100755 backend/views/site/index.php mode change 100644 => 100755 backend/views/site/login.php mode change 100644 => 100755 backend/web/.gitignore mode change 100644 => 100755 backend/web/.htaccess mode change 100644 => 100755 backend/web/assets/.gitignore mode change 100644 => 100755 backend/web/css/site.css mode change 100644 => 100755 backend/web/favicon.ico mode change 100644 => 100755 codeception.yml mode change 100644 => 100755 common/classes/Debug.php mode change 100644 => 100755 common/codeception.yml mode change 100644 => 100755 common/config/.gitignore mode change 100644 => 100755 common/config/bootstrap.php mode change 100644 => 100755 common/config/main.php mode change 100644 => 100755 common/config/params.php mode change 100644 => 100755 common/config/test.php mode change 100644 => 100755 common/fixtures/UserFixture.php mode change 100644 => 100755 common/hhapi/.gitignore mode change 100644 => 100755 common/hhapi/composer.json mode change 100644 => 100755 common/hhapi/core/lib/Company.php mode change 100644 => 100755 common/hhapi/core/lib/Vacancy.php mode change 100644 => 100755 common/hhapi/core/request/Request.php mode change 100644 => 100755 common/hhapi/core/service/HHService.php mode change 100644 => 100755 common/hhapi/index.php mode change 100644 => 100755 common/mail/layouts/html.php mode change 100644 => 100755 common/mail/layouts/text.php mode change 100644 => 100755 common/mail/passwordResetToken-html.php mode change 100644 => 100755 common/mail/passwordResetToken-text.php mode change 100644 => 100755 common/models/AdditionalFields.php create mode 100644 common/models/Balance.php mode change 100644 => 100755 common/models/CardSkill.php mode change 100644 => 100755 common/models/Company.php mode change 100644 => 100755 common/models/FieldsValue.php mode change 100644 => 100755 common/models/Hh.php mode change 100644 => 100755 common/models/HhJob.php mode change 100644 => 100755 common/models/LoginForm.php mode change 100644 => 100755 common/models/Position.php mode change 100644 => 100755 common/models/Project.php mode change 100644 => 100755 common/models/ProjectUser.php mode change 100644 => 100755 common/models/Skill.php mode change 100644 => 100755 common/models/Status.php mode change 100644 => 100755 common/models/UseField.php mode change 100644 => 100755 common/models/UseStatus.php mode change 100644 => 100755 common/models/User.php mode change 100644 => 100755 common/models/UserCard.php mode change 100644 => 100755 common/tests/_bootstrap.php mode change 100644 => 100755 common/tests/_data/user.php mode change 100644 => 100755 common/tests/_output/.gitignore mode change 100644 => 100755 common/tests/_support/.gitignore mode change 100644 => 100755 common/tests/_support/UnitTester.php mode change 100644 => 100755 common/tests/unit.suite.yml mode change 100644 => 100755 common/tests/unit/models/LoginFormTest.php mode change 100644 => 100755 common/widgets/Alert.php mode change 100644 => 100755 composer.json mode change 100644 => 100755 composer.lock mode change 100644 => 100755 console/config/.gitignore mode change 100644 => 100755 console/config/bootstrap.php mode change 100644 => 100755 console/config/main.php mode change 100644 => 100755 console/config/params.php mode change 100644 => 100755 console/controllers/.gitkeep mode change 100644 => 100755 console/migrations/m130524_201442_init.php mode change 100644 => 100755 console/migrations/m181003_070416_create_status_table.php mode change 100644 => 100755 console/migrations/m181003_070636_create_user_card_table.php mode change 100644 => 100755 console/migrations/m181003_082730_create_additional_fields_table.php mode change 100644 => 100755 console/migrations/m181003_092319_create_fields_value_table.php mode change 100644 => 100755 console/migrations/m181004_095927_add_column_resume_to_user_card_table.php mode change 100644 => 100755 console/migrations/m181004_102703_add_column_order_to_fields_value_table.php mode change 100644 => 100755 console/migrations/m181005_114117_create_use_status_table.php mode change 100644 => 100755 console/migrations/m181008_065248_create_use_field_table.php mode change 100644 => 100755 console/migrations/m181008_090446_create_project_table.php mode change 100644 => 100755 console/migrations/m181008_095803_add_project_id_field_to_fields_value.php mode change 100644 => 100755 console/migrations/m181008_105959_create_project_user_table.php mode change 100644 => 100755 console/migrations/m181011_140628_create_company_table.php mode change 100644 => 100755 console/migrations/m181011_140904_add_column_to_fields_value.php mode change 100644 => 100755 console/migrations/m181011_142555_add_column_to_user_card.php mode change 100644 => 100755 console/migrations/m181011_143349_add_column_company_id_to_project_table.php mode change 100644 => 100755 console/migrations/m181012_082916_create_position_table.php mode change 100644 => 100755 console/migrations/m181012_093626_add_position_id_column_to_user_card_table.php mode change 100644 => 100755 console/migrations/m181012_102422_create_skill_table.php mode change 100644 => 100755 console/migrations/m181106_082016_add_deleted_at_column_to_user_card_table.php mode change 100644 => 100755 console/migrations/m181121_103329_create_hh_table.php mode change 100644 => 100755 console/migrations/m181121_112940_create_hh_job_table.php mode change 100644 => 100755 console/migrations/m181121_135329_add_hh_id_column_to_project_table.php mode change 100644 => 100755 console/migrations/m181121_150057_add_schedule_column_to_hh_job_table.php create mode 100644 console/migrations/m190621_094843_add_balance.php mode change 100644 => 100755 console/models/.gitkeep mode change 100644 => 100755 console/runtime/.gitignore mode change 100644 => 100755 environments/dev/backend/config/main-local.php mode change 100644 => 100755 environments/dev/backend/config/params-local.php mode change 100644 => 100755 environments/dev/backend/config/test-local.php mode change 100644 => 100755 environments/dev/backend/web/index-test.php mode change 100644 => 100755 environments/dev/backend/web/index.php mode change 100644 => 100755 environments/dev/backend/web/robots.txt mode change 100644 => 100755 environments/dev/common/config/main-local.php mode change 100644 => 100755 environments/dev/common/config/params-local.php mode change 100644 => 100755 environments/dev/common/config/test-local.php mode change 100644 => 100755 environments/dev/console/config/main-local.php mode change 100644 => 100755 environments/dev/console/config/params-local.php mode change 100644 => 100755 environments/dev/frontend/config/main-local.php mode change 100644 => 100755 environments/dev/frontend/config/params-local.php mode change 100644 => 100755 environments/dev/frontend/config/test-local.php mode change 100644 => 100755 environments/dev/frontend/web/index-test.php mode change 100644 => 100755 environments/dev/frontend/web/index.php mode change 100644 => 100755 environments/dev/frontend/web/robots.txt mode change 100644 => 100755 environments/dev/yii mode change 100644 => 100755 environments/dev/yii_test mode change 100644 => 100755 environments/dev/yii_test.bat mode change 100644 => 100755 environments/index.php mode change 100644 => 100755 environments/prod/backend/config/main-local.php mode change 100644 => 100755 environments/prod/backend/config/params-local.php mode change 100644 => 100755 environments/prod/backend/web/index.php mode change 100644 => 100755 environments/prod/backend/web/robots.txt mode change 100644 => 100755 environments/prod/common/config/main-local.php mode change 100644 => 100755 environments/prod/common/config/params-local.php mode change 100644 => 100755 environments/prod/console/config/main-local.php mode change 100644 => 100755 environments/prod/console/config/params-local.php mode change 100644 => 100755 environments/prod/frontend/config/main-local.php mode change 100644 => 100755 environments/prod/frontend/config/params-local.php mode change 100644 => 100755 environments/prod/frontend/web/index.php mode change 100644 => 100755 environments/prod/frontend/web/robots.txt mode change 100644 => 100755 environments/prod/yii mode change 100644 => 100755 frontend/assets/AppAsset.php mode change 100644 => 100755 frontend/codeception.yml mode change 100644 => 100755 frontend/config/.gitignore mode change 100644 => 100755 frontend/config/bootstrap.php mode change 100644 => 100755 frontend/config/main.php mode change 100644 => 100755 frontend/config/params.php mode change 100644 => 100755 frontend/config/test.php mode change 100644 => 100755 frontend/controllers/SiteController.php mode change 100644 => 100755 frontend/models/ContactForm.php mode change 100644 => 100755 frontend/models/PasswordResetRequestForm.php mode change 100644 => 100755 frontend/models/ResetPasswordForm.php mode change 100644 => 100755 frontend/models/SignupForm.php mode change 100644 => 100755 frontend/runtime/.gitignore mode change 100644 => 100755 frontend/tests/_bootstrap.php mode change 100644 => 100755 frontend/tests/_data/login_data.php mode change 100644 => 100755 frontend/tests/_data/user.php mode change 100644 => 100755 frontend/tests/_output/.gitignore mode change 100644 => 100755 frontend/tests/_support/.gitignore mode change 100644 => 100755 frontend/tests/_support/FunctionalTester.php mode change 100644 => 100755 frontend/tests/_support/UnitTester.php mode change 100644 => 100755 frontend/tests/acceptance.suite.yml.example mode change 100644 => 100755 frontend/tests/acceptance/HomeCest.php mode change 100644 => 100755 frontend/tests/acceptance/_bootstrap.php mode change 100644 => 100755 frontend/tests/functional.suite.yml mode change 100644 => 100755 frontend/tests/functional/AboutCest.php mode change 100644 => 100755 frontend/tests/functional/ContactCest.php mode change 100644 => 100755 frontend/tests/functional/HomeCest.php mode change 100644 => 100755 frontend/tests/functional/LoginCest.php mode change 100644 => 100755 frontend/tests/functional/SignupCest.php mode change 100644 => 100755 frontend/tests/functional/_bootstrap.php mode change 100644 => 100755 frontend/tests/unit.suite.yml mode change 100644 => 100755 frontend/tests/unit/_bootstrap.php mode change 100644 => 100755 frontend/tests/unit/models/ContactFormTest.php mode change 100644 => 100755 frontend/tests/unit/models/PasswordResetRequestFormTest.php mode change 100644 => 100755 frontend/tests/unit/models/ResetPasswordFormTest.php mode change 100644 => 100755 frontend/tests/unit/models/SignupFormTest.php mode change 100644 => 100755 frontend/views/layouts/main.php mode change 100644 => 100755 frontend/views/site/about.php mode change 100644 => 100755 frontend/views/site/contact.php mode change 100644 => 100755 frontend/views/site/error.php mode change 100644 => 100755 frontend/views/site/index.php mode change 100644 => 100755 frontend/views/site/login.php mode change 100644 => 100755 frontend/views/site/requestPasswordResetToken.php mode change 100644 => 100755 frontend/views/site/resetPassword.php mode change 100644 => 100755 frontend/views/site/signup.php mode change 100644 => 100755 frontend/web/.gitignore mode change 100644 => 100755 frontend/web/.htaccess mode change 100644 => 100755 frontend/web/assets/.gitignore mode change 100644 => 100755 frontend/web/css/site.css mode change 100644 => 100755 frontend/web/favicon.ico mode change 100644 => 100755 frontend/web/media/upload/.gitignore mode change 100644 => 100755 init.bat mode change 100644 => 100755 requirements.php mode change 100644 => 100755 vagrant/config/.gitignore mode change 100644 => 100755 vagrant/config/vagrant-local.example.yml mode change 100644 => 100755 vagrant/nginx/app.conf mode change 100644 => 100755 vagrant/nginx/log/.gitignore mode change 100644 => 100755 vagrant/provision/always-as-root.sh mode change 100644 => 100755 vagrant/provision/common.sh mode change 100644 => 100755 vagrant/provision/once-as-root.sh mode change 100644 => 100755 vagrant/provision/once-as-vagrant.sh mode change 100644 => 100755 yii.bat diff --git a/.bowerrc b/.bowerrc old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.htaccess b/.htaccess old mode 100644 new mode 100755 diff --git a/LICENSE.md b/LICENSE.md old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/Vagrantfile b/Vagrantfile old mode 100644 new mode 100755 diff --git a/backend/assets/AppAsset.php b/backend/assets/AppAsset.php old mode 100644 new mode 100755 diff --git a/backend/codeception.yml b/backend/codeception.yml old mode 100644 new mode 100755 diff --git a/backend/config/.gitignore b/backend/config/.gitignore old mode 100644 new mode 100755 diff --git a/backend/config/bootstrap.php b/backend/config/bootstrap.php old mode 100644 new mode 100755 diff --git a/backend/config/main.php b/backend/config/main.php old mode 100644 new mode 100755 index 454bbf5..1bc988e --- a/backend/config/main.php +++ b/backend/config/main.php @@ -29,6 +29,9 @@ return [ 'hh' => [ 'class' => 'backend\modules\hh\Hh', ], + 'balance' => [ + 'class' => 'backend\modules\balance\Balance', + ], ], 'components' => [ 'request' => [ diff --git a/backend/config/params.php b/backend/config/params.php old mode 100644 new mode 100755 diff --git a/backend/config/test.php b/backend/config/test.php old mode 100644 new mode 100755 diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php old mode 100644 new mode 100755 diff --git a/backend/models/.gitkeep b/backend/models/.gitkeep old mode 100644 new mode 100755 diff --git a/backend/modules/balance/Balance.php b/backend/modules/balance/Balance.php new file mode 100644 index 0000000..9e9bc27 --- /dev/null +++ b/backend/modules/balance/Balance.php @@ -0,0 +1,24 @@ +search(); + + return $this->render('index',[ + 'searchModel' => $searchModel, + 'dataProvider' => $dataProvider, + ]); + } + + public function actionView($id) + { + return $this->render('view',[ + 'model' => $this->findModel($id), + ]); + } + + public function actionCreate() + { + $model = new Balance(); + + if ($model->load(Yii::$app->request->post())) { + $model->dt_add = strtotime($model->dt_add); + $model->save(); +// Debug::dd($model); + + Yii::$app->session->addFlash('success', 'Баланса добавлен'); + + return $this->redirect(['index']); + } + + return $this->render('create', [ + 'model' => $model, + ]); + } + + public function actionUpdate($id) + { + $model = $this->findModel($id); + + if ($model->load(Yii::$app->request->post()) && $model->save()) { + return $this->redirect(['view', 'id' => $model->id]); + } + + return $this->render('update',[ + 'model' => $model, + ]); + } + + public function actionDelete($id) + { + $this->findModel($id)->delete(); + + return $this->redirect(['index']); + } + + protected function findModel($id) + { + if (($model = Balance::findOne($id)) !== null) { + return $model; + } + + throw new NotFoundHttpException('The requested page does not exist.'); + } +} \ No newline at end of file diff --git a/backend/modules/balance/models/Balance.php b/backend/modules/balance/models/Balance.php new file mode 100644 index 0000000..8179aa2 --- /dev/null +++ b/backend/modules/balance/models/Balance.php @@ -0,0 +1,48 @@ +where( + [ + 'balance_id' => \Yii::$app->request->get('id'), + 'card_id' => null, + 'company_id' => null, + ]) + ->all(); + $array = []; + if (!empty($fieldValue)) { + foreach ($fieldValue as $item) { + array_push($array, ['field_id' => $item->field_id, 'value' => $item->value, 'order' => $item->order]); + } + $this->fields = $array; + } else { + $this->fields = [ + [ + 'field_id' => null, + 'value' => null, + 'order' => null, + ], + ]; + } + + $user = ArrayHelper::getColumn(ProjectUser::find()->where(['project_id' => \Yii::$app->request->get('id')])->all(), + 'card_id'); + + if (!empty($user)) { + $this->user = $user; + + } + } +} \ No newline at end of file diff --git a/backend/modules/balance/models/BalanceSearch.php b/backend/modules/balance/models/BalanceSearch.php new file mode 100644 index 0000000..0d83a55 --- /dev/null +++ b/backend/modules/balance/models/BalanceSearch.php @@ -0,0 +1,30 @@ + $query, + ]); + + if($this->validate()) + { + return $dataProvider; + } + } +} \ No newline at end of file diff --git a/backend/modules/balance/views/balance/_form.php b/backend/modules/balance/views/balance/_form.php new file mode 100644 index 0000000..97ba809 --- /dev/null +++ b/backend/modules/balance/views/balance/_form.php @@ -0,0 +1,85 @@ + + +
+ + + + field($model, 'type') + ->dropDownList( + [ + '1' => 'активный', + '0' => 'пассивный', + ] + )?> + + field($model, 'summ')->textInput(['maxlength' => 9]) ?> + + Выберите дату'; + echo '
'; + echo DatePicker::widget([ + 'model' => $model, + 'attribute' => 'dt_add', + 'language' => 'ru', + 'dateFormat' => 'dd-MM-yyyy', + ]); + ?> + +
+
+ field($model, 'fields')->widget(MultipleInput::class, [ + + 'columns' => [ + [ + 'name' => 'field_id', + 'type' => 'dropDownList', + 'title' => 'Поле', + 'defaultValue' => null, + 'items' => \yii\helpers\ArrayHelper::map(AdditionalFields::find() + ->joinWith('useFields') + ->where(['`use_field`.`use`' => \common\models\UseField::USE_BALANCE]) + ->all(), + 'id', 'name'), + 'options' => ['prompt' => 'Выберите'] + ], + [ + 'name' => 'value', + 'title' => 'Значение', + 'enableError' => true, + 'options' => [ + 'class' => 'input-priority' + ] + ], + [ + 'name' => 'order', + 'title' => 'Приоритет', + 'enableError' => true, + 'options' => [ + 'class' => 'input-priority' + ] + ] + ] + ])->label('Дополнительно'); + ?> +
+
+ +
+ 'btn btn-success']) ?> +
+ + + +
diff --git a/backend/modules/balance/views/balance/create.php b/backend/modules/balance/views/balance/create.php new file mode 100644 index 0000000..2bb25ef --- /dev/null +++ b/backend/modules/balance/views/balance/create.php @@ -0,0 +1,18 @@ +title = 'Добавить баланс'; +$this->params['breadcrumbs'][] = ['label' => 'Список балансов', 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> +
+ + render('_form', [ + 'model' => $model, + ]) ?> + +
diff --git a/backend/modules/balance/views/balance/index.php b/backend/modules/balance/views/balance/index.php new file mode 100644 index 0000000..fdf801a --- /dev/null +++ b/backend/modules/balance/views/balance/index.php @@ -0,0 +1,30 @@ +title = 'Список балансов'; +$this->params['breadcrumps'][] = $this->title; +?> +
+

+ 'btn btn-success']) ?> +

+ $dataProvider, + 'filterModel' => $searchModel, + 'columns' => [ + ['class' => 'yii\grid\SerialColumn'], + 'type', + 'summ', + 'dt_add', + ['class' => 'yii\grid\ActionColumn'], + ], + ]); ?> +
diff --git a/backend/modules/balance/views/balance/update.php b/backend/modules/balance/views/balance/update.php new file mode 100644 index 0000000..7396701 --- /dev/null +++ b/backend/modules/balance/views/balance/update.php @@ -0,0 +1,19 @@ +title = 'Редактировать баланс №' . $model->id; +$this->params['breadcrumbs'][] = ['label' => 'Список балансов', 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]]; +$this->params['breadcrumbs'][] = 'Редактировать'; +?> +
+ + render('_form', [ + 'model' => $model, + ]) ?> + +
diff --git a/backend/modules/balance/views/balance/view.php b/backend/modules/balance/views/balance/view.php new file mode 100644 index 0000000..a54782f --- /dev/null +++ b/backend/modules/balance/views/balance/view.php @@ -0,0 +1,35 @@ +title = 'Баланс №' . $model->id; +$this->params['breadcrumbs'][] = ['label' => 'Список балансов', 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> +
+

+ $model->id], ['class' => 'btn btn-primary']) ?> + $model->id], [ + 'class' => 'btn btn-danger', + 'data' => [ + 'confirm' => 'Are you sure you want to delete this item?', + 'method' => 'post', + ], + ]) ?> +

+ + $model, + 'attributes' => [ + 'id', + 'type', + 'summ', + 'dt_add', + ], + ]) ?> + +
diff --git a/backend/modules/card/Card.php b/backend/modules/card/Card.php old mode 100644 new mode 100755 diff --git a/backend/modules/card/controllers/UserCardController.php b/backend/modules/card/controllers/UserCardController.php old mode 100644 new mode 100755 diff --git a/backend/modules/card/models/UserCard.php b/backend/modules/card/models/UserCard.php old mode 100644 new mode 100755 diff --git a/backend/modules/card/models/UserCardSearch.php b/backend/modules/card/models/UserCardSearch.php old mode 100644 new mode 100755 diff --git a/backend/modules/card/views/user-card/_form.php b/backend/modules/card/views/user-card/_form.php old mode 100644 new mode 100755 diff --git a/backend/modules/card/views/user-card/_search.php b/backend/modules/card/views/user-card/_search.php old mode 100644 new mode 100755 diff --git a/backend/modules/card/views/user-card/create.php b/backend/modules/card/views/user-card/create.php old mode 100644 new mode 100755 diff --git a/backend/modules/card/views/user-card/index.php b/backend/modules/card/views/user-card/index.php old mode 100644 new mode 100755 diff --git a/backend/modules/card/views/user-card/update.php b/backend/modules/card/views/user-card/update.php old mode 100644 new mode 100755 diff --git a/backend/modules/card/views/user-card/view.php b/backend/modules/card/views/user-card/view.php old mode 100644 new mode 100755 diff --git a/backend/modules/company/Company.php b/backend/modules/company/Company.php old mode 100644 new mode 100755 diff --git a/backend/modules/company/controllers/CompanyController.php b/backend/modules/company/controllers/CompanyController.php old mode 100644 new mode 100755 diff --git a/backend/modules/company/models/Company.php b/backend/modules/company/models/Company.php old mode 100644 new mode 100755 diff --git a/backend/modules/company/models/CompanySearch.php b/backend/modules/company/models/CompanySearch.php old mode 100644 new mode 100755 diff --git a/backend/modules/company/views/company/_form.php b/backend/modules/company/views/company/_form.php old mode 100644 new mode 100755 diff --git a/backend/modules/company/views/company/_search.php b/backend/modules/company/views/company/_search.php old mode 100644 new mode 100755 diff --git a/backend/modules/company/views/company/create.php b/backend/modules/company/views/company/create.php old mode 100644 new mode 100755 diff --git a/backend/modules/company/views/company/index.php b/backend/modules/company/views/company/index.php old mode 100644 new mode 100755 diff --git a/backend/modules/company/views/company/update.php b/backend/modules/company/views/company/update.php old mode 100644 new mode 100755 diff --git a/backend/modules/company/views/company/view.php b/backend/modules/company/views/company/view.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/Hh.php b/backend/modules/hh/Hh.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/controllers/DefaultController.php b/backend/modules/hh/controllers/DefaultController.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/controllers/HhController.php b/backend/modules/hh/controllers/HhController.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/controllers/HhJobController.php b/backend/modules/hh/controllers/HhJobController.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/models/Hh.php b/backend/modules/hh/models/Hh.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/models/HhJob.php b/backend/modules/hh/models/HhJob.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/models/HhJobSearch.php b/backend/modules/hh/models/HhJobSearch.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/models/HhSearch.php b/backend/modules/hh/models/HhSearch.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/default/index.php b/backend/modules/hh/views/default/index.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh-job/_form.php b/backend/modules/hh/views/hh-job/_form.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh-job/_search.php b/backend/modules/hh/views/hh-job/_search.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh-job/create.php b/backend/modules/hh/views/hh-job/create.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh-job/index.php b/backend/modules/hh/views/hh-job/index.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh-job/update.php b/backend/modules/hh/views/hh-job/update.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh-job/view.php b/backend/modules/hh/views/hh-job/view.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh/_form.php b/backend/modules/hh/views/hh/_form.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh/_search.php b/backend/modules/hh/views/hh/_search.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh/create.php b/backend/modules/hh/views/hh/create.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh/index.php b/backend/modules/hh/views/hh/index.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh/update.php b/backend/modules/hh/views/hh/update.php old mode 100644 new mode 100755 diff --git a/backend/modules/hh/views/hh/view.php b/backend/modules/hh/views/hh/view.php old mode 100644 new mode 100755 diff --git a/backend/modules/project/Project.php b/backend/modules/project/Project.php old mode 100644 new mode 100755 diff --git a/backend/modules/project/controllers/ProjectController.php b/backend/modules/project/controllers/ProjectController.php old mode 100644 new mode 100755 diff --git a/backend/modules/project/models/Project.php b/backend/modules/project/models/Project.php old mode 100644 new mode 100755 diff --git a/backend/modules/project/models/ProjectSearch.php b/backend/modules/project/models/ProjectSearch.php old mode 100644 new mode 100755 diff --git a/backend/modules/project/views/project/_form.php b/backend/modules/project/views/project/_form.php old mode 100644 new mode 100755 diff --git a/backend/modules/project/views/project/_search.php b/backend/modules/project/views/project/_search.php old mode 100644 new mode 100755 diff --git a/backend/modules/project/views/project/create.php b/backend/modules/project/views/project/create.php old mode 100644 new mode 100755 diff --git a/backend/modules/project/views/project/index.php b/backend/modules/project/views/project/index.php old mode 100644 new mode 100755 diff --git a/backend/modules/project/views/project/update.php b/backend/modules/project/views/project/update.php old mode 100644 new mode 100755 diff --git a/backend/modules/project/views/project/view.php b/backend/modules/project/views/project/view.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/Settings.php b/backend/modules/settings/Settings.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/controllers/AdditionalFieldsController.php b/backend/modules/settings/controllers/AdditionalFieldsController.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/controllers/PositionController.php b/backend/modules/settings/controllers/PositionController.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/controllers/SkillController.php b/backend/modules/settings/controllers/SkillController.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/controllers/StatusController.php b/backend/modules/settings/controllers/StatusController.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/models/AdditionalFields.php b/backend/modules/settings/models/AdditionalFields.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/models/AdditionalFieldsSearch.php b/backend/modules/settings/models/AdditionalFieldsSearch.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/models/Position.php b/backend/modules/settings/models/Position.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/models/PositionSearch.php b/backend/modules/settings/models/PositionSearch.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/models/Skill.php b/backend/modules/settings/models/Skill.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/models/SkillSearch.php b/backend/modules/settings/models/SkillSearch.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/models/Status.php b/backend/modules/settings/models/Status.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/models/StatusSearch.php b/backend/modules/settings/models/StatusSearch.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/additional-fields/_form.php b/backend/modules/settings/views/additional-fields/_form.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/additional-fields/_search.php b/backend/modules/settings/views/additional-fields/_search.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/additional-fields/create.php b/backend/modules/settings/views/additional-fields/create.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/additional-fields/index.php b/backend/modules/settings/views/additional-fields/index.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/additional-fields/update.php b/backend/modules/settings/views/additional-fields/update.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/additional-fields/view.php b/backend/modules/settings/views/additional-fields/view.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/position/_form.php b/backend/modules/settings/views/position/_form.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/position/_search.php b/backend/modules/settings/views/position/_search.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/position/create.php b/backend/modules/settings/views/position/create.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/position/index.php b/backend/modules/settings/views/position/index.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/position/update.php b/backend/modules/settings/views/position/update.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/position/view.php b/backend/modules/settings/views/position/view.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/skill/_form.php b/backend/modules/settings/views/skill/_form.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/skill/_search.php b/backend/modules/settings/views/skill/_search.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/skill/create.php b/backend/modules/settings/views/skill/create.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/skill/index.php b/backend/modules/settings/views/skill/index.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/skill/update.php b/backend/modules/settings/views/skill/update.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/skill/view.php b/backend/modules/settings/views/skill/view.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/status/_form.php b/backend/modules/settings/views/status/_form.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/status/_search.php b/backend/modules/settings/views/status/_search.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/status/create.php b/backend/modules/settings/views/status/create.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/status/index.php b/backend/modules/settings/views/status/index.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/status/update.php b/backend/modules/settings/views/status/update.php old mode 100644 new mode 100755 diff --git a/backend/modules/settings/views/status/view.php b/backend/modules/settings/views/status/view.php old mode 100644 new mode 100755 diff --git a/backend/runtime/.gitignore b/backend/runtime/.gitignore old mode 100644 new mode 100755 diff --git a/backend/tests/_bootstrap.php b/backend/tests/_bootstrap.php old mode 100644 new mode 100755 diff --git a/backend/tests/_data/.gitignore b/backend/tests/_data/.gitignore old mode 100644 new mode 100755 diff --git a/backend/tests/_data/login_data.php b/backend/tests/_data/login_data.php old mode 100644 new mode 100755 diff --git a/backend/tests/_output/.gitignore b/backend/tests/_output/.gitignore old mode 100644 new mode 100755 diff --git a/backend/tests/_support/.gitignore b/backend/tests/_support/.gitignore old mode 100644 new mode 100755 diff --git a/backend/tests/_support/FunctionalTester.php b/backend/tests/_support/FunctionalTester.php old mode 100644 new mode 100755 diff --git a/backend/tests/_support/UnitTester.php b/backend/tests/_support/UnitTester.php old mode 100644 new mode 100755 diff --git a/backend/tests/functional.suite.yml b/backend/tests/functional.suite.yml old mode 100644 new mode 100755 diff --git a/backend/tests/functional/LoginCest.php b/backend/tests/functional/LoginCest.php old mode 100644 new mode 100755 diff --git a/backend/tests/functional/_bootstrap.php b/backend/tests/functional/_bootstrap.php old mode 100644 new mode 100755 diff --git a/backend/tests/unit.suite.yml b/backend/tests/unit.suite.yml old mode 100644 new mode 100755 diff --git a/backend/tests/unit/_bootstrap.php b/backend/tests/unit/_bootstrap.php old mode 100644 new mode 100755 diff --git a/backend/views/layouts/content.php b/backend/views/layouts/content.php old mode 100644 new mode 100755 diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php old mode 100644 new mode 100755 diff --git a/backend/views/layouts/left.php b/backend/views/layouts/left.php old mode 100644 new mode 100755 index 1d31b74..a1ca583 --- a/backend/views/layouts/left.php +++ b/backend/views/layouts/left.php @@ -33,7 +33,8 @@ ['label' => 'Компании', 'icon' => 'building', 'url' => ['/hh/hh']], ['label' => 'Вакансии', 'icon' => 'user-md', 'url' => ['/hh/hh-job']], ], - ] + ], + ['label' => 'Баланс', 'icon' => 'dollar', 'url' => ['/balance/balance']], /*['label' => 'Gii', 'icon' => 'file-code-o', 'url' => ['/gii']], ['label' => 'Debug', 'icon' => 'dashboard', 'url' => ['/debug']], diff --git a/backend/views/layouts/main-login.php b/backend/views/layouts/main-login.php old mode 100644 new mode 100755 diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php old mode 100644 new mode 100755 diff --git a/backend/views/site/error.php b/backend/views/site/error.php old mode 100644 new mode 100755 diff --git a/backend/views/site/index.php b/backend/views/site/index.php old mode 100644 new mode 100755 diff --git a/backend/views/site/login.php b/backend/views/site/login.php old mode 100644 new mode 100755 diff --git a/backend/web/.gitignore b/backend/web/.gitignore old mode 100644 new mode 100755 diff --git a/backend/web/.htaccess b/backend/web/.htaccess old mode 100644 new mode 100755 diff --git a/backend/web/assets/.gitignore b/backend/web/assets/.gitignore old mode 100644 new mode 100755 diff --git a/backend/web/css/site.css b/backend/web/css/site.css old mode 100644 new mode 100755 diff --git a/backend/web/favicon.ico b/backend/web/favicon.ico old mode 100644 new mode 100755 diff --git a/codeception.yml b/codeception.yml old mode 100644 new mode 100755 diff --git a/common/classes/Debug.php b/common/classes/Debug.php old mode 100644 new mode 100755 diff --git a/common/codeception.yml b/common/codeception.yml old mode 100644 new mode 100755 diff --git a/common/config/.gitignore b/common/config/.gitignore old mode 100644 new mode 100755 diff --git a/common/config/bootstrap.php b/common/config/bootstrap.php old mode 100644 new mode 100755 diff --git a/common/config/main.php b/common/config/main.php old mode 100644 new mode 100755 diff --git a/common/config/params.php b/common/config/params.php old mode 100644 new mode 100755 diff --git a/common/config/test.php b/common/config/test.php old mode 100644 new mode 100755 diff --git a/common/fixtures/UserFixture.php b/common/fixtures/UserFixture.php old mode 100644 new mode 100755 diff --git a/common/hhapi/.gitignore b/common/hhapi/.gitignore old mode 100644 new mode 100755 diff --git a/common/hhapi/composer.json b/common/hhapi/composer.json old mode 100644 new mode 100755 diff --git a/common/hhapi/core/lib/Company.php b/common/hhapi/core/lib/Company.php old mode 100644 new mode 100755 diff --git a/common/hhapi/core/lib/Vacancy.php b/common/hhapi/core/lib/Vacancy.php old mode 100644 new mode 100755 diff --git a/common/hhapi/core/request/Request.php b/common/hhapi/core/request/Request.php old mode 100644 new mode 100755 diff --git a/common/hhapi/core/service/HHService.php b/common/hhapi/core/service/HHService.php old mode 100644 new mode 100755 diff --git a/common/hhapi/index.php b/common/hhapi/index.php old mode 100644 new mode 100755 diff --git a/common/mail/layouts/html.php b/common/mail/layouts/html.php old mode 100644 new mode 100755 diff --git a/common/mail/layouts/text.php b/common/mail/layouts/text.php old mode 100644 new mode 100755 diff --git a/common/mail/passwordResetToken-html.php b/common/mail/passwordResetToken-html.php old mode 100644 new mode 100755 diff --git a/common/mail/passwordResetToken-text.php b/common/mail/passwordResetToken-text.php old mode 100644 new mode 100755 diff --git a/common/models/AdditionalFields.php b/common/models/AdditionalFields.php old mode 100644 new mode 100755 diff --git a/common/models/Balance.php b/common/models/Balance.php new file mode 100644 index 0000000..5f801db --- /dev/null +++ b/common/models/Balance.php @@ -0,0 +1,45 @@ + 'id', + 'type' => 'Тип', + 'summ' => 'Сумма', + 'dt_add' => 'Дата добавления', + ]; + } + + public function afterFind() + { + parent::afterFind(); // TODO: Change the autogenerated stub + $this->dt_add = date('d-m-Y',$this->dt_add); + } +} \ No newline at end of file diff --git a/common/models/CardSkill.php b/common/models/CardSkill.php old mode 100644 new mode 100755 diff --git a/common/models/Company.php b/common/models/Company.php old mode 100644 new mode 100755 diff --git a/common/models/FieldsValue.php b/common/models/FieldsValue.php old mode 100644 new mode 100755 index 940484f..fba2215 --- a/common/models/FieldsValue.php +++ b/common/models/FieldsValue.php @@ -37,12 +37,13 @@ class FieldsValue extends \yii\db\ActiveRecord { return [ [['field_id', 'value'], 'required'], - [['card_id', 'field_id', 'order', 'project_id', 'company_id'], 'integer'], + [['card_id', 'field_id', 'order', 'project_id', 'company_id','balance_id'], 'integer'], [['value'], 'string', 'max' => 255], [['field_id'], 'exist', 'skipOnError' => true, 'targetClass' => AdditionalFields::class, 'targetAttribute' => ['field_id' => 'id']], [['company_id'], 'exist', 'skipOnError' => true, 'targetClass' => Company::class, 'targetAttribute' => ['company_id' => 'id']], [['project_id'], 'exist', 'skipOnError' => true, 'targetClass' => Project::class, 'targetAttribute' => ['project_id' => 'id']], [['card_id'], 'exist', 'skipOnError' => true, 'targetClass' => UserCard::class, 'targetAttribute' => ['card_id' => 'id']], + [['balance_id'],'exist', 'skipOnError' => true, 'targetClass' => Balance::class, 'targetAttribute' => ['balance_id' => 'id']], ]; } diff --git a/common/models/Hh.php b/common/models/Hh.php old mode 100644 new mode 100755 diff --git a/common/models/HhJob.php b/common/models/HhJob.php old mode 100644 new mode 100755 diff --git a/common/models/LoginForm.php b/common/models/LoginForm.php old mode 100644 new mode 100755 diff --git a/common/models/Position.php b/common/models/Position.php old mode 100644 new mode 100755 diff --git a/common/models/Project.php b/common/models/Project.php old mode 100644 new mode 100755 diff --git a/common/models/ProjectUser.php b/common/models/ProjectUser.php old mode 100644 new mode 100755 diff --git a/common/models/Skill.php b/common/models/Skill.php old mode 100644 new mode 100755 diff --git a/common/models/Status.php b/common/models/Status.php old mode 100644 new mode 100755 diff --git a/common/models/UseField.php b/common/models/UseField.php old mode 100644 new mode 100755 index 3980614..84c2de8 --- a/common/models/UseField.php +++ b/common/models/UseField.php @@ -21,6 +21,7 @@ class UseField extends \yii\db\ActiveRecord const USE_PROFILE = 0; const USE_PROJECT = 1; const USE_COMPANY = 2; + const USE_BALANCE = 3; /** @@ -68,7 +69,8 @@ class UseField extends \yii\db\ActiveRecord return [ self::USE_PROFILE => 'Профиль', self::USE_PROJECT => 'Проект', - self::USE_COMPANY => 'Компания' + self::USE_COMPANY => 'Компания', + self::USE_BALANCE => 'Баланс' ]; } diff --git a/common/models/UseStatus.php b/common/models/UseStatus.php old mode 100644 new mode 100755 index ffa0673..0e9b151 --- a/common/models/UseStatus.php +++ b/common/models/UseStatus.php @@ -21,6 +21,7 @@ class UseStatus extends \yii\db\ActiveRecord const USE_PROFILE = 0; const USE_PROJECT = 1; const USE_COMPANY = 2; + const USE_BALANCE = 3; /** * {@inheritdoc} @@ -67,7 +68,8 @@ class UseStatus extends \yii\db\ActiveRecord return [ self::USE_PROFILE => 'Профиль', self::USE_PROJECT => 'Проект', - self::USE_COMPANY => 'Компания' + self::USE_COMPANY => 'Компания', + self::USE_BALANCE => 'Баланс' ]; } diff --git a/common/models/User.php b/common/models/User.php old mode 100644 new mode 100755 diff --git a/common/models/UserCard.php b/common/models/UserCard.php old mode 100644 new mode 100755 diff --git a/common/tests/_bootstrap.php b/common/tests/_bootstrap.php old mode 100644 new mode 100755 diff --git a/common/tests/_data/user.php b/common/tests/_data/user.php old mode 100644 new mode 100755 diff --git a/common/tests/_output/.gitignore b/common/tests/_output/.gitignore old mode 100644 new mode 100755 diff --git a/common/tests/_support/.gitignore b/common/tests/_support/.gitignore old mode 100644 new mode 100755 diff --git a/common/tests/_support/UnitTester.php b/common/tests/_support/UnitTester.php old mode 100644 new mode 100755 diff --git a/common/tests/unit.suite.yml b/common/tests/unit.suite.yml old mode 100644 new mode 100755 diff --git a/common/tests/unit/models/LoginFormTest.php b/common/tests/unit/models/LoginFormTest.php old mode 100644 new mode 100755 diff --git a/common/widgets/Alert.php b/common/widgets/Alert.php old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 index 2bc3407..4e6622d --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ "unclead/yii2-multiple-input": "~2.0", "mihaildev/yii2-elfinder": "*", "kartik-v/yii2-widget-select2": "@dev", - "kavalar/hhapi": "@dev" + "kavalar/hhapi": "@dev", + "kartik-v/yii2-widget-datepicker": "@dev" }, "require-dev": { "yiisoft/yii2-debug": "~2.0.0", diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 index 8824874..3fb278b --- a/composer.lock +++ b/composer.lock @@ -4,19 +4,19 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "690fb4ff58b0c920877e5f27a7dd6165", + "content-hash": "7c8e337361e574ba82a9b37a944713b9", "packages": [ { "name": "almasaeed2010/adminlte", "version": "v2.4.8", "source": { "type": "git", - "url": "https://github.com/almasaeed2010/AdminLTE.git", + "url": "https://github.com/ColorlibHQ/AdminLTE.git", "reference": "d9e68301848a95dff2e2dbef6569e617a9b3fa30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/almasaeed2010/AdminLTE/zipball/d9e68301848a95dff2e2dbef6569e617a9b3fa30", + "url": "https://api.github.com/repos/ColorlibHQ/AdminLTE/zipball/d9e68301848a95dff2e2dbef6569e617a9b3fa30", "reference": "d9e68301848a95dff2e2dbef6569e617a9b3fa30", "shasum": "" }, @@ -61,8 +61,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/twbs/bootstrap/zipball/0b9c4a4007c44201dce9a6cc1a38407005c26c86", - "reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86", - "shasum": null + "reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86" }, "require": { "bower-asset/jquery": ">=1.9.1,<4.0" @@ -83,8 +82,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/5e670ad62f50c738388d4dcec78d2888505ad77b", - "reference": "5e670ad62f50c738388d4dcec78d2888505ad77b", - "shasum": null + "reference": "5e670ad62f50c738388d4dcec78d2888505ad77b" }, "require": { "bower-asset/jquery": ">=1.7" @@ -99,14 +97,13 @@ "version": "3.2.1", "source": { "type": "git", - "url": "git@github.com:jquery/jquery-dist.git", + "url": "https://github.com/jquery/jquery-dist.git", "reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/77d2a51d0520d2ee44173afdf4e40a9201f5964e", - "reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e", - "shasum": null + "reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e" }, "type": "bower-asset", "license": [ @@ -118,14 +115,13 @@ "version": "1.12.1", "source": { "type": "git", - "url": "https://github.com/components/jqueryui.git", + "url": "git@github.com:components/jqueryui.git", "reference": "44ecf3794cc56b65954cc19737234a3119d036cc" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/components/jqueryui/zipball/44ecf3794cc56b65954cc19737234a3119d036cc", - "reference": "44ecf3794cc56b65954cc19737234a3119d036cc", - "shasum": null + "reference": "44ecf3794cc56b65954cc19737234a3119d036cc" }, "require": { "bower-asset/jquery": ">=1.6" @@ -146,8 +142,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/bestiejs/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3", - "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3", - "shasum": null + "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3" }, "type": "bower-asset" }, @@ -162,8 +157,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/aef7b953107264f00234902a3880eb50dafc48be", - "reference": "aef7b953107264f00234902a3880eb50dafc48be", - "shasum": null + "reference": "aef7b953107264f00234902a3880eb50dafc48be" }, "require": { "bower-asset/jquery": ">=1.8" @@ -713,6 +707,60 @@ ], "time": "2018-09-27T18:02:35+00:00" }, + { + "name": "kartik-v/yii2-widget-datepicker", + "version": "v1.4.6", + "source": { + "type": "git", + "url": "https://github.com/kartik-v/yii2-widget-datepicker.git", + "reference": "01a5940fb1b70b39b7916a4e68768f8626024ddc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-datepicker/zipball/01a5940fb1b70b39b7916a4e68768f8626024ddc", + "reference": "01a5940fb1b70b39b7916a4e68768f8626024ddc", + "shasum": "" + }, + "require": { + "kartik-v/yii2-krajee-base": "~1.9" + }, + "type": "yii2-extension", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-4": { + "kartik\\date\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kartik Visweswaran", + "email": "kartikv2@gmail.com", + "homepage": "http://www.krajee.com/" + } + ], + "description": "Enhanced Yii2 wrapper for the bootstrap datepicker plugin (sub repo split from yii2-widgets).", + "homepage": "https://github.com/kartik-v/yii2-widget-datepicker", + "keywords": [ + "date", + "extension", + "form", + "jquery", + "picker", + "plugin", + "select2", + "widget", + "yii2" + ], + "time": "2018-08-29T12:10:45+00:00" + }, { "name": "kartik-v/yii2-widget-select2", "version": "dev-master", @@ -1448,8 +1496,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/twitter/typeahead.js/zipball/588440f66559714280628a4f9799f0c4eb880a4a", - "reference": "588440f66559714280628a4f9799f0c4eb880a4a", - "shasum": null + "reference": "588440f66559714280628a4f9799f0c4eb880a4a" }, "require": { "bower-asset/jquery": ">=1.7" @@ -3941,7 +3988,8 @@ "minimum-stability": "stable", "stability-flags": { "kartik-v/yii2-widget-select2": 20, - "kavalar/hhapi": 20 + "kavalar/hhapi": 20, + "kartik-v/yii2-widget-datepicker": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/console/config/.gitignore b/console/config/.gitignore old mode 100644 new mode 100755 diff --git a/console/config/bootstrap.php b/console/config/bootstrap.php old mode 100644 new mode 100755 diff --git a/console/config/main.php b/console/config/main.php old mode 100644 new mode 100755 diff --git a/console/config/params.php b/console/config/params.php old mode 100644 new mode 100755 diff --git a/console/controllers/.gitkeep b/console/controllers/.gitkeep old mode 100644 new mode 100755 diff --git a/console/migrations/m130524_201442_init.php b/console/migrations/m130524_201442_init.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181003_070416_create_status_table.php b/console/migrations/m181003_070416_create_status_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181003_070636_create_user_card_table.php b/console/migrations/m181003_070636_create_user_card_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181003_082730_create_additional_fields_table.php b/console/migrations/m181003_082730_create_additional_fields_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181003_092319_create_fields_value_table.php b/console/migrations/m181003_092319_create_fields_value_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181004_095927_add_column_resume_to_user_card_table.php b/console/migrations/m181004_095927_add_column_resume_to_user_card_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181004_102703_add_column_order_to_fields_value_table.php b/console/migrations/m181004_102703_add_column_order_to_fields_value_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181005_114117_create_use_status_table.php b/console/migrations/m181005_114117_create_use_status_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181008_065248_create_use_field_table.php b/console/migrations/m181008_065248_create_use_field_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181008_090446_create_project_table.php b/console/migrations/m181008_090446_create_project_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181008_095803_add_project_id_field_to_fields_value.php b/console/migrations/m181008_095803_add_project_id_field_to_fields_value.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181008_105959_create_project_user_table.php b/console/migrations/m181008_105959_create_project_user_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181011_140628_create_company_table.php b/console/migrations/m181011_140628_create_company_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181011_140904_add_column_to_fields_value.php b/console/migrations/m181011_140904_add_column_to_fields_value.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181011_142555_add_column_to_user_card.php b/console/migrations/m181011_142555_add_column_to_user_card.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181011_143349_add_column_company_id_to_project_table.php b/console/migrations/m181011_143349_add_column_company_id_to_project_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181012_082916_create_position_table.php b/console/migrations/m181012_082916_create_position_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181012_093626_add_position_id_column_to_user_card_table.php b/console/migrations/m181012_093626_add_position_id_column_to_user_card_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181012_102422_create_skill_table.php b/console/migrations/m181012_102422_create_skill_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181106_082016_add_deleted_at_column_to_user_card_table.php b/console/migrations/m181106_082016_add_deleted_at_column_to_user_card_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181121_103329_create_hh_table.php b/console/migrations/m181121_103329_create_hh_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181121_112940_create_hh_job_table.php b/console/migrations/m181121_112940_create_hh_job_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181121_135329_add_hh_id_column_to_project_table.php b/console/migrations/m181121_135329_add_hh_id_column_to_project_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m181121_150057_add_schedule_column_to_hh_job_table.php b/console/migrations/m181121_150057_add_schedule_column_to_hh_job_table.php old mode 100644 new mode 100755 diff --git a/console/migrations/m190621_094843_add_balance.php b/console/migrations/m190621_094843_add_balance.php new file mode 100644 index 0000000..10624ac --- /dev/null +++ b/console/migrations/m190621_094843_add_balance.php @@ -0,0 +1,45 @@ +createTable('balance',[ + 'id' => $this->primaryKey(), + 'type' => $this->integer(1), + 'summ' => $this->integer(4), + 'dt_add' => $this->integer(11), + ]); + } + + /** + * {@inheritdoc} + */ + public function safeDown() + { + $this->dropTable('balance'); + } + + /* + // Use up()/down() to run migration code without a transaction. + public function up() + { + + } + + public function down() + { + echo "m190621_094843_add_balance cannot be reverted.\n"; + + return false; + } + */ +} diff --git a/console/models/.gitkeep b/console/models/.gitkeep old mode 100644 new mode 100755 diff --git a/console/runtime/.gitignore b/console/runtime/.gitignore old mode 100644 new mode 100755 diff --git a/environments/dev/backend/config/main-local.php b/environments/dev/backend/config/main-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/backend/config/params-local.php b/environments/dev/backend/config/params-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/backend/config/test-local.php b/environments/dev/backend/config/test-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/backend/web/index-test.php b/environments/dev/backend/web/index-test.php old mode 100644 new mode 100755 diff --git a/environments/dev/backend/web/index.php b/environments/dev/backend/web/index.php old mode 100644 new mode 100755 diff --git a/environments/dev/backend/web/robots.txt b/environments/dev/backend/web/robots.txt old mode 100644 new mode 100755 diff --git a/environments/dev/common/config/main-local.php b/environments/dev/common/config/main-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/common/config/params-local.php b/environments/dev/common/config/params-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/common/config/test-local.php b/environments/dev/common/config/test-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/console/config/main-local.php b/environments/dev/console/config/main-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/console/config/params-local.php b/environments/dev/console/config/params-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/frontend/config/main-local.php b/environments/dev/frontend/config/main-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/frontend/config/params-local.php b/environments/dev/frontend/config/params-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/frontend/config/test-local.php b/environments/dev/frontend/config/test-local.php old mode 100644 new mode 100755 diff --git a/environments/dev/frontend/web/index-test.php b/environments/dev/frontend/web/index-test.php old mode 100644 new mode 100755 diff --git a/environments/dev/frontend/web/index.php b/environments/dev/frontend/web/index.php old mode 100644 new mode 100755 diff --git a/environments/dev/frontend/web/robots.txt b/environments/dev/frontend/web/robots.txt old mode 100644 new mode 100755 diff --git a/environments/dev/yii b/environments/dev/yii old mode 100644 new mode 100755 diff --git a/environments/dev/yii_test b/environments/dev/yii_test old mode 100644 new mode 100755 diff --git a/environments/dev/yii_test.bat b/environments/dev/yii_test.bat old mode 100644 new mode 100755 diff --git a/environments/index.php b/environments/index.php old mode 100644 new mode 100755 diff --git a/environments/prod/backend/config/main-local.php b/environments/prod/backend/config/main-local.php old mode 100644 new mode 100755 diff --git a/environments/prod/backend/config/params-local.php b/environments/prod/backend/config/params-local.php old mode 100644 new mode 100755 diff --git a/environments/prod/backend/web/index.php b/environments/prod/backend/web/index.php old mode 100644 new mode 100755 diff --git a/environments/prod/backend/web/robots.txt b/environments/prod/backend/web/robots.txt old mode 100644 new mode 100755 diff --git a/environments/prod/common/config/main-local.php b/environments/prod/common/config/main-local.php old mode 100644 new mode 100755 diff --git a/environments/prod/common/config/params-local.php b/environments/prod/common/config/params-local.php old mode 100644 new mode 100755 diff --git a/environments/prod/console/config/main-local.php b/environments/prod/console/config/main-local.php old mode 100644 new mode 100755 diff --git a/environments/prod/console/config/params-local.php b/environments/prod/console/config/params-local.php old mode 100644 new mode 100755 diff --git a/environments/prod/frontend/config/main-local.php b/environments/prod/frontend/config/main-local.php old mode 100644 new mode 100755 diff --git a/environments/prod/frontend/config/params-local.php b/environments/prod/frontend/config/params-local.php old mode 100644 new mode 100755 diff --git a/environments/prod/frontend/web/index.php b/environments/prod/frontend/web/index.php old mode 100644 new mode 100755 diff --git a/environments/prod/frontend/web/robots.txt b/environments/prod/frontend/web/robots.txt old mode 100644 new mode 100755 diff --git a/environments/prod/yii b/environments/prod/yii old mode 100644 new mode 100755 diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php old mode 100644 new mode 100755 diff --git a/frontend/codeception.yml b/frontend/codeception.yml old mode 100644 new mode 100755 diff --git a/frontend/config/.gitignore b/frontend/config/.gitignore old mode 100644 new mode 100755 diff --git a/frontend/config/bootstrap.php b/frontend/config/bootstrap.php old mode 100644 new mode 100755 diff --git a/frontend/config/main.php b/frontend/config/main.php old mode 100644 new mode 100755 index ea12607..d539bf9 --- a/frontend/config/main.php +++ b/frontend/config/main.php @@ -14,6 +14,7 @@ return [ 'components' => [ 'request' => [ 'csrfParam' => '_csrf-frontend', + 'baseUrl' => '', ], 'user' => [ 'identityClass' => 'common\models\User', diff --git a/frontend/config/params.php b/frontend/config/params.php old mode 100644 new mode 100755 diff --git a/frontend/config/test.php b/frontend/config/test.php old mode 100644 new mode 100755 diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php old mode 100644 new mode 100755 diff --git a/frontend/models/ContactForm.php b/frontend/models/ContactForm.php old mode 100644 new mode 100755 diff --git a/frontend/models/PasswordResetRequestForm.php b/frontend/models/PasswordResetRequestForm.php old mode 100644 new mode 100755 diff --git a/frontend/models/ResetPasswordForm.php b/frontend/models/ResetPasswordForm.php old mode 100644 new mode 100755 diff --git a/frontend/models/SignupForm.php b/frontend/models/SignupForm.php old mode 100644 new mode 100755 diff --git a/frontend/runtime/.gitignore b/frontend/runtime/.gitignore old mode 100644 new mode 100755 diff --git a/frontend/tests/_bootstrap.php b/frontend/tests/_bootstrap.php old mode 100644 new mode 100755 diff --git a/frontend/tests/_data/login_data.php b/frontend/tests/_data/login_data.php old mode 100644 new mode 100755 diff --git a/frontend/tests/_data/user.php b/frontend/tests/_data/user.php old mode 100644 new mode 100755 diff --git a/frontend/tests/_output/.gitignore b/frontend/tests/_output/.gitignore old mode 100644 new mode 100755 diff --git a/frontend/tests/_support/.gitignore b/frontend/tests/_support/.gitignore old mode 100644 new mode 100755 diff --git a/frontend/tests/_support/FunctionalTester.php b/frontend/tests/_support/FunctionalTester.php old mode 100644 new mode 100755 diff --git a/frontend/tests/_support/UnitTester.php b/frontend/tests/_support/UnitTester.php old mode 100644 new mode 100755 diff --git a/frontend/tests/acceptance.suite.yml.example b/frontend/tests/acceptance.suite.yml.example old mode 100644 new mode 100755 diff --git a/frontend/tests/acceptance/HomeCest.php b/frontend/tests/acceptance/HomeCest.php old mode 100644 new mode 100755 diff --git a/frontend/tests/acceptance/_bootstrap.php b/frontend/tests/acceptance/_bootstrap.php old mode 100644 new mode 100755 diff --git a/frontend/tests/functional.suite.yml b/frontend/tests/functional.suite.yml old mode 100644 new mode 100755 diff --git a/frontend/tests/functional/AboutCest.php b/frontend/tests/functional/AboutCest.php old mode 100644 new mode 100755 diff --git a/frontend/tests/functional/ContactCest.php b/frontend/tests/functional/ContactCest.php old mode 100644 new mode 100755 diff --git a/frontend/tests/functional/HomeCest.php b/frontend/tests/functional/HomeCest.php old mode 100644 new mode 100755 diff --git a/frontend/tests/functional/LoginCest.php b/frontend/tests/functional/LoginCest.php old mode 100644 new mode 100755 diff --git a/frontend/tests/functional/SignupCest.php b/frontend/tests/functional/SignupCest.php old mode 100644 new mode 100755 diff --git a/frontend/tests/functional/_bootstrap.php b/frontend/tests/functional/_bootstrap.php old mode 100644 new mode 100755 diff --git a/frontend/tests/unit.suite.yml b/frontend/tests/unit.suite.yml old mode 100644 new mode 100755 diff --git a/frontend/tests/unit/_bootstrap.php b/frontend/tests/unit/_bootstrap.php old mode 100644 new mode 100755 diff --git a/frontend/tests/unit/models/ContactFormTest.php b/frontend/tests/unit/models/ContactFormTest.php old mode 100644 new mode 100755 diff --git a/frontend/tests/unit/models/PasswordResetRequestFormTest.php b/frontend/tests/unit/models/PasswordResetRequestFormTest.php old mode 100644 new mode 100755 diff --git a/frontend/tests/unit/models/ResetPasswordFormTest.php b/frontend/tests/unit/models/ResetPasswordFormTest.php old mode 100644 new mode 100755 diff --git a/frontend/tests/unit/models/SignupFormTest.php b/frontend/tests/unit/models/SignupFormTest.php old mode 100644 new mode 100755 diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php old mode 100644 new mode 100755 diff --git a/frontend/views/site/about.php b/frontend/views/site/about.php old mode 100644 new mode 100755 diff --git a/frontend/views/site/contact.php b/frontend/views/site/contact.php old mode 100644 new mode 100755 diff --git a/frontend/views/site/error.php b/frontend/views/site/error.php old mode 100644 new mode 100755 diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php old mode 100644 new mode 100755 diff --git a/frontend/views/site/login.php b/frontend/views/site/login.php old mode 100644 new mode 100755 diff --git a/frontend/views/site/requestPasswordResetToken.php b/frontend/views/site/requestPasswordResetToken.php old mode 100644 new mode 100755 diff --git a/frontend/views/site/resetPassword.php b/frontend/views/site/resetPassword.php old mode 100644 new mode 100755 diff --git a/frontend/views/site/signup.php b/frontend/views/site/signup.php old mode 100644 new mode 100755 diff --git a/frontend/web/.gitignore b/frontend/web/.gitignore old mode 100644 new mode 100755 diff --git a/frontend/web/.htaccess b/frontend/web/.htaccess old mode 100644 new mode 100755 diff --git a/frontend/web/assets/.gitignore b/frontend/web/assets/.gitignore old mode 100644 new mode 100755 diff --git a/frontend/web/css/site.css b/frontend/web/css/site.css old mode 100644 new mode 100755 diff --git a/frontend/web/favicon.ico b/frontend/web/favicon.ico old mode 100644 new mode 100755 diff --git a/frontend/web/media/upload/.gitignore b/frontend/web/media/upload/.gitignore old mode 100644 new mode 100755 diff --git a/init.bat b/init.bat old mode 100644 new mode 100755 diff --git a/requirements.php b/requirements.php old mode 100644 new mode 100755 diff --git a/vagrant/config/.gitignore b/vagrant/config/.gitignore old mode 100644 new mode 100755 diff --git a/vagrant/config/vagrant-local.example.yml b/vagrant/config/vagrant-local.example.yml old mode 100644 new mode 100755 diff --git a/vagrant/nginx/app.conf b/vagrant/nginx/app.conf old mode 100644 new mode 100755 diff --git a/vagrant/nginx/log/.gitignore b/vagrant/nginx/log/.gitignore old mode 100644 new mode 100755 diff --git a/vagrant/provision/always-as-root.sh b/vagrant/provision/always-as-root.sh old mode 100644 new mode 100755 diff --git a/vagrant/provision/common.sh b/vagrant/provision/common.sh old mode 100644 new mode 100755 diff --git a/vagrant/provision/once-as-root.sh b/vagrant/provision/once-as-root.sh old mode 100644 new mode 100755 diff --git a/vagrant/provision/once-as-vagrant.sh b/vagrant/provision/once-as-vagrant.sh old mode 100644 new mode 100755 diff --git a/yii.bat b/yii.bat old mode 100644 new mode 100755 From f343677f954d1c449723e7edf082f500bc641787 Mon Sep 17 00:00:00 2001 From: kavalar Date: Sat, 22 Jun 2019 22:17:08 +0300 Subject: [PATCH 2/3] some fix --- common/models/UseField.php | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/models/UseField.php b/common/models/UseField.php index 3980614..e1218e7 100644 --- a/common/models/UseField.php +++ b/common/models/UseField.php @@ -39,7 +39,7 @@ class UseField extends \yii\db\ActiveRecord return [ [['field_id', 'use'], 'required'], [['field_id', 'use'], 'integer'], - [['field_id'], 'exist', 'skipOnError' => true, 'targetClass' => AdditionalFields::className(), 'targetAttribute' => ['field_id' => 'id']], + [['field_id'], 'exist', 'skipOnError' => true, 'targetClass' => AdditionalFields::class, 'targetAttribute' => ['field_id' => 'id']], ]; } diff --git a/composer.json b/composer.json index 2bc3407..5cee905 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ }, "minimum-stability": "stable", "require": { - "php": ">=5.4.0", + "php": ">=7.1.0", "yiisoft/yii2": "~2.0.6", "yiisoft/yii2-bootstrap": "~2.0.0", "yiisoft/yii2-swiftmailer": "~2.0.0 || ~2.1.0", From 2f4f92bdecfe3d5fb824c5f0b7755f7f8f8c1d85 Mon Sep 17 00:00:00 2001 From: kavalar Date: Tue, 25 Jun 2019 12:37:09 +0300 Subject: [PATCH 3/3] new balance --- .../balance/controllers/BalanceController.php | 19 +++- backend/modules/balance/models/Balance.php | 25 +++--- .../modules/balance/models/BalanceSearch.php | 75 ++++++++++++++-- .../modules/balance/views/balance/_form.php | 7 +- .../modules/balance/views/balance/_search.php | 33 +++++++ .../modules/balance/views/balance/index.php | 32 ++++++- .../modules/balance/views/balance/view.php | 30 ++++++- backend/widgets/DateRangeWidget.php | 18 ++++ backend/widgets/SummRangeWidget.php | 19 ++++ backend/widgets/views/date_range.php | 21 +++++ backend/widgets/views/summ_range.php | 12 +++ common/models/Balance.php | 86 +++++++++++++----- common/models/FieldsValueNew.php | 65 ++++++++++++++ composer.json | 3 +- composer.lock | 89 ++++++++++++++++++- .../m190622_195218_fields_value_new.php | 47 ++++++++++ 16 files changed, 523 insertions(+), 58 deletions(-) create mode 100644 backend/modules/balance/views/balance/_search.php create mode 100644 backend/widgets/DateRangeWidget.php create mode 100644 backend/widgets/SummRangeWidget.php create mode 100644 backend/widgets/views/date_range.php create mode 100644 backend/widgets/views/summ_range.php create mode 100644 common/models/FieldsValueNew.php create mode 100644 console/migrations/m190622_195218_fields_value_new.php diff --git a/backend/modules/balance/controllers/BalanceController.php b/backend/modules/balance/controllers/BalanceController.php index 6dab500..af6ab28 100644 --- a/backend/modules/balance/controllers/BalanceController.php +++ b/backend/modules/balance/controllers/BalanceController.php @@ -5,7 +5,10 @@ namespace backend\modules\balance\controllers; use backend\modules\balance\models\Balance; use backend\modules\balance\models\BalanceSearch; use common\classes\Debug; +use common\models\FieldsValue; +use common\models\FieldsValueNew; use Yii; +use yii\data\ActiveDataProvider; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\db\Query; @@ -15,7 +18,7 @@ class BalanceController extends Controller public function actionIndex() { $searchModel = new BalanceSearch(); - $dataProvider = $searchModel->search(); + $dataProvider = $searchModel->search(Yii::$app->request->queryParams); return $this->render('index',[ 'searchModel' => $searchModel, @@ -25,8 +28,18 @@ class BalanceController extends Controller public function actionView($id) { + $dataProviderF = new ActiveDataProvider([ + 'query' => FieldsValueNew::find() + ->where(['item_id' => $id, 'item_type' => FieldsValueNew::TYPE_BALANCE]) + ->orderBy('order'), + 'pagination' => [ + 'pageSize' => 200, + ], + ]); + return $this->render('view',[ 'model' => $this->findModel($id), + 'dataProviderF' => $dataProviderF ]); } @@ -53,7 +66,9 @@ class BalanceController extends Controller { $model = $this->findModel($id); - if ($model->load(Yii::$app->request->post()) && $model->save()) { + if ($model->load(Yii::$app->request->post())) { + $model->dt_add = strtotime($model->dt_add); + $model->save(); return $this->redirect(['view', 'id' => $model->id]); } diff --git a/backend/modules/balance/models/Balance.php b/backend/modules/balance/models/Balance.php index 8179aa2..9076748 100644 --- a/backend/modules/balance/models/Balance.php +++ b/backend/modules/balance/models/Balance.php @@ -5,20 +5,23 @@ namespace backend\modules\balance\models; use common\models\FieldsValue; +use common\models\FieldsValueNew; use common\models\ProjectUser; use yii\helpers\ArrayHelper; class Balance extends \common\models\Balance { + public $fields; + public function init() { parent::init(); - $fieldValue = FieldsValue::find() + $fieldValue = FieldsValueNew::find() ->where( [ - 'balance_id' => \Yii::$app->request->get('id'), - 'card_id' => null, - 'company_id' => null, + //'balance_id' => \Yii::$app->request->get('id'), + 'item_id' => \Yii::$app->request->get('id'), + 'item_type' => FieldsValueNew::TYPE_BALANCE, ]) ->all(); $array = []; @@ -37,12 +40,12 @@ class Balance extends \common\models\Balance ]; } - $user = ArrayHelper::getColumn(ProjectUser::find()->where(['project_id' => \Yii::$app->request->get('id')])->all(), - 'card_id'); - - if (!empty($user)) { - $this->user = $user; - - } +// $user = ArrayHelper::getColumn(ProjectUser::find()->where(['project_id' => \Yii::$app->request->get('id')])->all(), +// 'card_id'); +// +// if (!empty($user)) { +// $this->user = $user; +// +// } } } \ No newline at end of file diff --git a/backend/modules/balance/models/BalanceSearch.php b/backend/modules/balance/models/BalanceSearch.php index 0d83a55..8623741 100644 --- a/backend/modules/balance/models/BalanceSearch.php +++ b/backend/modules/balance/models/BalanceSearch.php @@ -1,30 +1,89 @@ $query, ]); - if($this->validate()) - { + $this->load($params); + + if (!$this->validate()) { + // uncomment the following line if you do not want to return any records when validation fails + // $query->where('0=1'); return $dataProvider; } + + // grid filtering conditions + $query->andFilterWhere([ + 'id' => $this->id, + 'type' => $this->type, + //'summ' => $this->summ, + 'dt_add' => $this->dt_add, + ]); + + //Debug::dd($this); + + if($this->dt_from && $this->dt_to){ + $query->where(['between', 'dt_add', strtotime($this->$this->dt_from), strtotime($this->$this->dt_to)]); + } + if($this->dt_from){ + $query->where(['>', 'dt_add', strtotime($this->$this->dt_from)]); + } + + $summ_from = $this->summ_from ?: 0; + $summ_to = $this->summ_to ?: 9999999999; + + $query->andFilterWhere(['between', 'summ', $summ_from, $summ_to]); + + return $dataProvider; } -} \ No newline at end of file +} diff --git a/backend/modules/balance/views/balance/_form.php b/backend/modules/balance/views/balance/_form.php index 97ba809..efa92da 100644 --- a/backend/modules/balance/views/balance/_form.php +++ b/backend/modules/balance/views/balance/_form.php @@ -17,12 +17,7 @@ use yii\widgets\ActiveForm; field($model, 'type') - ->dropDownList( - [ - '1' => 'активный', - '0' => 'пассивный', - ] - )?> + ->dropDownList(\common\models\Balance::getTypeList())?> field($model, 'summ')->textInput(['maxlength' => 9]) ?> diff --git a/backend/modules/balance/views/balance/_search.php b/backend/modules/balance/views/balance/_search.php new file mode 100644 index 0000000..0df270b --- /dev/null +++ b/backend/modules/balance/views/balance/_search.php @@ -0,0 +1,33 @@ + + +
+ + ['index'], + 'method' => 'get', + ]); ?> + + field($model, 'id') ?> + + field($model, 'type') ?> + + field($model, 'summ') ?> + + field($model, 'dt_add') ?> + +
+ 'btn btn-primary']) ?> + 'btn btn-default']) ?> +
+ + + +
diff --git a/backend/modules/balance/views/balance/index.php b/backend/modules/balance/views/balance/index.php index fdf801a..170b1c5 100644 --- a/backend/modules/balance/views/balance/index.php +++ b/backend/modules/balance/views/balance/index.php @@ -1,5 +1,6 @@ params['breadcrumps'][] = $this->title; 'filterModel' => $searchModel, 'columns' => [ ['class' => 'yii\grid\SerialColumn'], - 'type', - 'summ', - 'dt_add', + [ + 'attribute' => 'type', + 'value' => function ($model) { + return \common\models\Balance::getTypeName($model->type); + }, + 'filter' => kartik\select2\Select2::widget([ + 'model' => $searchModel, + 'attribute' => 'type', + 'data' => \common\models\Balance::getTypeList(), + 'options' => ['placeholder' => 'Начните вводить...','class' => 'form-control'], + 'pluginOptions' => [ + 'allowClear' => true + ], + ]), + ], + [ + 'attribute' => 'summ', + 'filter' => \backend\widgets\SummRangeWidget::widget([ + 'model' => $searchModel, + ]), + + ], + [ + 'attribute' => 'dt_add', + 'value' => 'dt_add', + 'filter' => \yii\jui\DatePicker::widget(['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']), + 'format' => 'html', + ], ['class' => 'yii\grid\ActionColumn'], ], ]); ?> diff --git a/backend/modules/balance/views/balance/view.php b/backend/modules/balance/views/balance/view.php index a54782f..daf144a 100644 --- a/backend/modules/balance/views/balance/view.php +++ b/backend/modules/balance/views/balance/view.php @@ -1,9 +1,11 @@ title = 'Баланс №' . $model->id; @@ -12,8 +14,9 @@ $this->params['breadcrumbs'][] = $this->title; ?>

- $model->id], ['class' => 'btn btn-primary']) ?> - $model->id], [ + 'btn btn-primary']) ?> + $model->id], ['class' => 'btn btn-primary']) ?> + $model->id], [ 'class' => 'btn btn-danger', 'data' => [ 'confirm' => 'Are you sure you want to delete this item?', @@ -25,11 +28,30 @@ $this->params['breadcrumbs'][] = $this->title; $model, 'attributes' => [ - 'id', - 'type', + //'id', + [ + 'attribute' => 'type', + 'value' => function($model){ + return \common\models\Balance::getTypeName($model->type); + } + ], 'summ', 'dt_add', ], ]) ?> +

Дополнительные сведения

+ + $dataProviderF, + 'layout' => "{items}", + 'columns' => [ + 'field.name:text:Поле', + [ + 'attribute' => 'value', + 'label' => 'Значение' + ], + ], + ]); ?> +
diff --git a/backend/widgets/DateRangeWidget.php b/backend/widgets/DateRangeWidget.php new file mode 100644 index 0000000..513362f --- /dev/null +++ b/backend/widgets/DateRangeWidget.php @@ -0,0 +1,18 @@ +render('date_range', ['model' => $this->model]); + } + +} \ No newline at end of file diff --git a/backend/widgets/SummRangeWidget.php b/backend/widgets/SummRangeWidget.php new file mode 100644 index 0000000..cc97005 --- /dev/null +++ b/backend/widgets/SummRangeWidget.php @@ -0,0 +1,19 @@ +render('summ_range', ['model' => $this->model]); + } + +} \ No newline at end of file diff --git a/backend/widgets/views/date_range.php b/backend/widgets/views/date_range.php new file mode 100644 index 0000000..5a253f7 --- /dev/null +++ b/backend/widgets/views/date_range.php @@ -0,0 +1,21 @@ + $model, + 'attribute' => 'dt_from', + 'language' => 'ru', + 'dateFormat' => 'dd-MM-yyyy', +]); + +echo " - "; + +echo DatePicker::widget([ + 'model' => $model, + 'attribute' => 'dt_to', + 'language' => 'ru', + 'dateFormat' => 'dd-MM-yyyy', +]); \ No newline at end of file diff --git a/backend/widgets/views/summ_range.php b/backend/widgets/views/summ_range.php new file mode 100644 index 0000000..85675aa --- /dev/null +++ b/backend/widgets/views/summ_range.php @@ -0,0 +1,12 @@ + 'От', +]); +echo ' - '; +echo \yii\helpers\Html::activeTextInput($model, 'summ_to', [ + 'placeholder' => 'До', +]); \ No newline at end of file diff --git a/common/models/Balance.php b/common/models/Balance.php index 5f801db..105a7c8 100644 --- a/common/models/Balance.php +++ b/common/models/Balance.php @@ -15,31 +15,75 @@ use common\classes\Debug; */ class Balance extends \yii\db\ActiveRecord { - public static function tableName() + const TYPE_ACTIVE = 1; + const TYPE_PASSIVE = 0; + + public static function getTypeName($id) { - return 'balance'; + return self::getTypeList()[$id]; } - public function rules() - { - return [ - [['type', 'summ', 'dt_add'], 'integer'], - ]; - } - - public function attributeLabels() - { + public static function getTypeList() + { return [ - 'id' => 'id', - 'type' => 'Тип', - 'summ' => 'Сумма', - 'dt_add' => 'Дата добавления', + self::TYPE_ACTIVE => 'Актив', + self::TYPE_PASSIVE => 'Пассив', ]; - } + } - public function afterFind() - { - parent::afterFind(); // TODO: Change the autogenerated stub - $this->dt_add = date('d-m-Y',$this->dt_add); - } + public static function tableName() + { + return 'balance'; + } + + public function rules() + { + return [ + [['type', 'summ', 'dt_add'], 'integer'], + ]; + } + + public function attributeLabels() + { + return [ + 'id' => 'id', + 'type' => 'Тип', + 'summ' => 'Сумма', + 'dt_add' => 'Дата добавления', + ]; + } + + public function afterFind() + { + parent::afterFind(); // TODO: Change the autogenerated stub + $this->dt_add = date('d-m-Y', $this->dt_add); + } + + /** + * @return \yii\db\ActiveQuery + */ + public function getFieldsValues() + { + return $this->hasMany(FieldsValueNew::class, ['item_id' => 'id', 'item_type' => FieldsValueNew::TYPE_BALANCE]); + } + + public function afterSave($insert, $changedAttributes) + { + $post = \Yii::$app->request->post('Balance'); + + FieldsValueNew::deleteAll(['item_id' => $this->id, 'item_type' => FieldsValueNew::TYPE_BALANCE]); + + foreach ($post['fields'] as $item) { + $fildsValue = new FieldsValueNew(); + $fildsValue->field_id = $item['field_id']; + $fildsValue->value = $item['value']; + $fildsValue->order = $item['order']; + $fildsValue->item_id = $this->id; + $fildsValue->item_type = FieldsValueNew::TYPE_BALANCE; + + $fildsValue->save(); + } + + parent::afterSave($insert, $changedAttributes); // TODO: Change the autogenerated stub + } } \ No newline at end of file diff --git a/common/models/FieldsValueNew.php b/common/models/FieldsValueNew.php new file mode 100644 index 0000000..f2a9fa7 --- /dev/null +++ b/common/models/FieldsValueNew.php @@ -0,0 +1,65 @@ + 'ID', + 'field_id' => 'Field ID', + 'item_id' => 'Item ID', + 'item_type' => 'Item Type', + 'order' => 'Order', + 'value' => 'Value', + ]; + } + + /** + * @return \yii\db\ActiveQuery + */ + public function getField() + { + return $this->hasOne(AdditionalFields::class, ['id' => 'field_id']); + } +} diff --git a/composer.json b/composer.json index e4438ae..5909483 100755 --- a/composer.json +++ b/composer.json @@ -23,7 +23,8 @@ "mihaildev/yii2-elfinder": "*", "kartik-v/yii2-widget-select2": "@dev", "kavalar/hhapi": "@dev", - "kartik-v/yii2-widget-datepicker": "@dev" + "kartik-v/yii2-widget-datepicker": "@dev", + "nkovacs/yii2-datetimepicker": "*" }, "require-dev": { "yiisoft/yii2-debug": "~2.0.0", diff --git a/composer.lock b/composer.lock index 3fb278b..24c0151 100755 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7c8e337361e574ba82a9b37a944713b9", + "content-hash": "7578e68130787df83321118c46ab02e6", "packages": [ { "name": "almasaeed2010/adminlte", @@ -131,6 +131,46 @@ "MIT" ] }, + { + "name": "bower-asset/moment", + "version": "2.24.0", + "source": { + "type": "git", + "url": "https://github.com/moment/moment.git", + "reference": "96d0d6791ab495859d09a868803d31a55c917de1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/moment/moment/zipball/96d0d6791ab495859d09a868803d31a55c917de1", + "reference": "96d0d6791ab495859d09a868803d31a55c917de1" + }, + "type": "bower-asset", + "license": [ + "MIT" + ] + }, + { + "name": "bower-asset/nkovacs-bootstrap-datetimepicker", + "version": "5.0.4", + "source": { + "type": "git", + "url": "git@github.com:nkovacs/bootstrap-datetimepicker.git", + "reference": "c7cae4e1ddcc56c42135f117bba15112f18a8c77" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nkovacs/bootstrap-datetimepicker/zipball/c7cae4e1ddcc56c42135f117bba15112f18a8c77", + "reference": "c7cae4e1ddcc56c42135f117bba15112f18a8c77" + }, + "require": { + "bower-asset/jquery": ">=1.8.3", + "bower-asset/moment": ">=2.9.0" + }, + "type": "bower-asset", + "license": [ + "MIT" + ] + }, { "name": "bower-asset/punycode", "version": "v1.3.2", @@ -896,6 +936,51 @@ ], "time": "2018-10-01T17:00:54+00:00" }, + { + "name": "nkovacs/yii2-datetimepicker", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/nkovacs/yii2-datetimepicker.git", + "reference": "ea99923f6851ef7e4224f9fd4411df048d97275e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nkovacs/yii2-datetimepicker/zipball/ea99923f6851ef7e4224f9fd4411df048d97275e", + "reference": "ea99923f6851ef7e4224f9fd4411df048d97275e", + "shasum": "" + }, + "require": { + "bower-asset/nkovacs-bootstrap-datetimepicker": "~5.0", + "php": ">=5.4.0", + "yiisoft/yii2": "^2.0.4", + "yiisoft/yii2-bootstrap": "*" + }, + "type": "yii2-extension", + "autoload": { + "psr-4": { + "nkovacs\\datetimepicker\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikola Kovacs", + "email": "nikola.kovacs@gmail.com" + } + ], + "description": "Bootstrap datetimepicker widget for Yii 2, based on Eonasdan/bootstrap-datetimepicker.", + "keywords": [ + "DateTimePicker", + "bootstrap", + "extension", + "yii2" + ], + "time": "2017-03-28T08:57:15+00:00" + }, { "name": "rmrevin/yii2-fontawesome", "version": "2.17.1", @@ -3994,7 +4079,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.4.0" + "php": ">=7.1.0" }, "platform-dev": [] } diff --git a/console/migrations/m190622_195218_fields_value_new.php b/console/migrations/m190622_195218_fields_value_new.php new file mode 100644 index 0000000..aac3d5c --- /dev/null +++ b/console/migrations/m190622_195218_fields_value_new.php @@ -0,0 +1,47 @@ +createTable('fields_value_new',[ + 'id' => $this->primaryKey(), + 'field_id' => $this->integer(11)->notNull(), + 'item_id' => $this->integer(11)->notNull(), + 'item_type' => $this->integer(4)->notNull(), + 'order' => $this->integer(11), + 'value' => $this->text(), + ]); + } + + /** + * {@inheritdoc} + */ + public function safeDown() + { + $this->dropTable('fields_value_new'); + } + + /* + // Use up()/down() to run migration code without a transaction. + public function up() + { + + } + + public function down() + { + echo "m190622_195218_fields_value_new cannot be reverted.\n"; + + return false; + } + */ +}