diff --git a/controllers/ExamMemberRankQuestion.php b/controllers/ExamMemberRankQuestion.php index f81e51e..6d6dc41 100644 --- a/controllers/ExamMemberRankQuestion.php +++ b/controllers/ExamMemberRankQuestion.php @@ -5,13 +5,13 @@ use BackendMenu; class ExamMemberRankQuestion extends Controller { - public $implement = [ 'Backend\Behaviors\ListController', 'Backend\Behaviors\FormController' ]; - - public $listConfig = 'config_list.yaml'; - public $formConfig = 'config_form.yaml'; + public $implement = ['Backend\Behaviors\ListController', 'Backend\Behaviors\FormController']; - public function __construct() - { - parent::__construct(); - } + public $listConfig = 'config_list.yaml'; + public $formConfig = 'config_form.yaml'; + + public function __construct() + { + parent::__construct(); + } } diff --git a/controllers/exammemberrankquestion/_list_toolbar.htm b/controllers/exammemberrankquestion/_list_toolbar.htm index 76b0f02..1ec0e53 100644 --- a/controllers/exammemberrankquestion/_list_toolbar.htm +++ b/controllers/exammemberrankquestion/_list_toolbar.htm @@ -1,18 +1,23 @@
- - + data-request="onDelete" + data-request-confirm="" + data-trigger-action="enable" + data-trigger=".control-list input[type=checkbox]" + data-trigger-condition="checked" + data-request-success="$(this).prop('disabled', true)" + data-stripe-load-indicator + > + +
diff --git a/controllers/exammemberrankquestion/config_form.yaml b/controllers/exammemberrankquestion/config_form.yaml index 0839f61..3c59e60 100644 --- a/controllers/exammemberrankquestion/config_form.yaml +++ b/controllers/exammemberrankquestion/config_form.yaml @@ -3,8 +3,8 @@ form: $/germanairlinesva/schooling/models/exammemberrankquestion/fields.yaml modelClass: GermanAirlinesVa\Schooling\Models\ExamMemberRankQuestion defaultRedirect: germanairlinesva/schooling/exammemberrankquestion create: - redirect: 'germanairlinesva/schooling/exammemberrankquestion/update/:id' - redirectClose: germanairlinesva/schooling/exammemberrankquestion + redirect: 'germanairlinesva/schooling/exammemberrankquestion/update/:id' + redirectClose: germanairlinesva/schooling/exammemberrankquestion update: - redirect: germanairlinesva/schooling/exammemberrankquestion - redirectClose: germanairlinesva/schooling/exammemberrankquestion + redirect: germanairlinesva/schooling/exammemberrankquestion + redirectClose: germanairlinesva/schooling/exammemberrankquestion diff --git a/controllers/exammemberrankquestion/create.htm b/controllers/exammemberrankquestion/create.htm index bd54315..7695c2e 100644 --- a/controllers/exammemberrankquestion/create.htm +++ b/controllers/exammemberrankquestion/create.htm @@ -1,46 +1,56 @@ - + fatalError): ?> - 'layout']) ?> + +'layout']) ?> -
- formRender() ?> -
+
formRender() ?>
-
-
- - - - - -
-
+
+
+ + + + + + +
+
- + -

fatalError)) ?>

-

- \ No newline at end of file +

fatalError)) ?>

+

+ +

+ diff --git a/controllers/exammemberrankquestion/preview.htm b/controllers/exammemberrankquestion/preview.htm index 320abf4..e99e755 100644 --- a/controllers/exammemberrankquestion/preview.htm +++ b/controllers/exammemberrankquestion/preview.htm @@ -1,22 +1,25 @@ - + fatalError): ?> -
- formRenderPreview() ?> -
+
formRenderPreview() ?>
-

fatalError) ?>

+

fatalError) ?>

- - - -

\ No newline at end of file + + + +

diff --git a/controllers/exammemberrankquestion/update.htm b/controllers/exammemberrankquestion/update.htm index 31b6e0b..01a6be1 100644 --- a/controllers/exammemberrankquestion/update.htm +++ b/controllers/exammemberrankquestion/update.htm @@ -1,54 +1,64 @@ - + fatalError): ?> - 'layout']) ?> + +'layout']) ?> -
- formRender() ?> -
+
formRender() ?>
-
-
- - - +
+
+ + + - - - -
-
- + + + + +
+
+ -

fatalError)) ?>

-

- \ No newline at end of file +

fatalError)) ?>

+

+ +

+ diff --git a/controllers/memberrank/_list_toolbar.htm b/controllers/memberrank/_list_toolbar.htm index e0b5670..6c8e407 100644 --- a/controllers/memberrank/_list_toolbar.htm +++ b/controllers/memberrank/_list_toolbar.htm @@ -1,18 +1,21 @@
- - + data-request="onDelete" + data-request-confirm="" + data-trigger-action="enable" + data-trigger=".control-list input[type=checkbox]" + data-trigger-condition="checked" + data-request-success="$(this).prop('disabled', true)" + data-stripe-load-indicator + > + +
diff --git a/controllers/memberrank/config_form.yaml b/controllers/memberrank/config_form.yaml index c96fb2d..15aab0c 100644 --- a/controllers/memberrank/config_form.yaml +++ b/controllers/memberrank/config_form.yaml @@ -3,8 +3,8 @@ form: $/germanairlinesva/schooling/models/memberrank/fields.yaml modelClass: GermanAirlinesVa\Schooling\Models\MemberRank defaultRedirect: germanairlinesva/schooling/memberrank create: - redirect: 'germanairlinesva/schooling/memberrank/update/:id' - redirectClose: germanairlinesva/schooling/memberrank + redirect: 'germanairlinesva/schooling/memberrank/update/:id' + redirectClose: germanairlinesva/schooling/memberrank update: - redirect: germanairlinesva/schooling/memberrank - redirectClose: germanairlinesva/schooling/memberrank + redirect: germanairlinesva/schooling/memberrank + redirectClose: germanairlinesva/schooling/memberrank diff --git a/controllers/memberrank/config_list.yaml b/controllers/memberrank/config_list.yaml index 56012c5..d097438 100644 --- a/controllers/memberrank/config_list.yaml +++ b/controllers/memberrank/config_list.yaml @@ -6,7 +6,7 @@ showSetup: true showCheckboxes: true recordsPerPage: 20 toolbar: - buttons: list_toolbar - search: - prompt: 'backend::lang.list.search_prompt' + buttons: list_toolbar + search: + prompt: 'backend::lang.list.search_prompt' recordUrl: 'germanairlinesva/schooling/memberrank/update/:id' diff --git a/controllers/memberrank/update.htm b/controllers/memberrank/update.htm index c236904..67ffc0c 100644 --- a/controllers/memberrank/update.htm +++ b/controllers/memberrank/update.htm @@ -1,54 +1,62 @@ - + fatalError): ?> - 'layout']) ?> + +'layout']) ?> -
- formRender() ?> -
+
formRender() ?>
-
-
- - - +
+
+ + + - - - -
-
- + + + + +
+
+ -

fatalError)) ?>

-

- \ No newline at end of file +

fatalError)) ?>

+

+ +

+ diff --git a/models/exammemberrankquestion/columns.yaml b/models/exammemberrankquestion/columns.yaml index cd22355..dd041de 100644 --- a/models/exammemberrankquestion/columns.yaml +++ b/models/exammemberrankquestion/columns.yaml @@ -1,19 +1,19 @@ columns: - id: - label: id - type: text - member_rank_id: - label: member_rank_id - type: text - in_use: - label: in_use - type: text - mandatory: - label: mandatory - type: text - text: - label: text - type: text - picture: - label: picture - type: text + id: + label: id + type: text + member_rank_id: + label: member_rank_id + type: text + in_use: + label: in_use + type: text + mandatory: + label: mandatory + type: text + text: + label: text + type: text + picture: + label: picture + type: text diff --git a/models/exammemberrankquestion/fields.yaml b/models/exammemberrankquestion/fields.yaml index 97d7339..f2f8be1 100644 --- a/models/exammemberrankquestion/fields.yaml +++ b/models/exammemberrankquestion/fields.yaml @@ -1,29 +1,29 @@ fields: - member_rank: - label: 'germanairlinesva.schooling::lang.exam_question.rank' - nameFrom: name - descriptionFrom: description - span: auto - required: 1 - type: relation - in_use: - label: 'germanairlinesva.schooling::lang.exam_question.in_use' - span: auto - required: 1 - type: switch - mandatory: - label: 'germanairlinesva.schooling::lang.exam_question.mandatory' - span: auto - required: 1 - type: switch - text: - label: 'germanairlinesva.schooling::lang.exam_question.text' - size: large - span: auto - required: 1 - type: richeditor - picture: - label: 'germanairlinesva.schooling::lang.exam_question.picture' - mode: file - span: auto - type: mediafinder + member_rank: + label: 'germanairlinesva.schooling::lang.exam_question.rank' + nameFrom: name + descriptionFrom: description + span: auto + required: 1 + type: relation + in_use: + label: 'germanairlinesva.schooling::lang.exam_question.in_use' + span: auto + required: 1 + type: switch + mandatory: + label: 'germanairlinesva.schooling::lang.exam_question.mandatory' + span: auto + required: 1 + type: switch + text: + label: 'germanairlinesva.schooling::lang.exam_question.text' + size: large + span: auto + required: 1 + type: richeditor + picture: + label: 'germanairlinesva.schooling::lang.exam_question.picture' + mode: file + span: auto + type: mediafinder diff --git a/models/memberrank/columns.yaml b/models/memberrank/columns.yaml index a27a0b7..e7bb21b 100644 --- a/models/memberrank/columns.yaml +++ b/models/memberrank/columns.yaml @@ -1,22 +1,22 @@ columns: - id: - label: id - type: text - name: - label: name - type: text - description: - label: description - type: text - points: - label: points - type: number - price: - label: price - type: number - badge: - label: badge - type: text - region: - label: region - type: text + id: + label: id + type: text + name: + label: name + type: text + description: + label: description + type: text + points: + label: points + type: number + price: + label: price + type: number + badge: + label: badge + type: text + region: + label: region + type: text diff --git a/models/memberrank/fields.yaml b/models/memberrank/fields.yaml index ed47a3b..b72eca6 100644 --- a/models/memberrank/fields.yaml +++ b/models/memberrank/fields.yaml @@ -1,32 +1,32 @@ fields: - name: - label: 'germanairlinesva.schooling::lang.member_rank.name' - span: auto - required: 1 - type: text - description: - label: 'germanairlinesva.schooling::lang.member_rank.description' - size: small - span: auto - required: 1 - type: richeditor - points: - label: 'germanairlinesva.schooling::lang.member_rank.points' - span: auto - required: 1 - type: number - price: - label: 'germanairlinesva.schooling::lang.member_rank.price' - span: auto - type: number - badge: - label: 'germanairlinesva.schooling::lang.member_rank.badge' - mode: file - span: auto - required: 1 - type: mediafinder - region: - label: 'germanairlinesva.schooling::lang.member_rank.region' - span: auto - required: 1 - type: text + name: + label: 'germanairlinesva.schooling::lang.member_rank.name' + span: auto + required: 1 + type: text + description: + label: 'germanairlinesva.schooling::lang.member_rank.description' + size: small + span: auto + required: 1 + type: richeditor + points: + label: 'germanairlinesva.schooling::lang.member_rank.points' + span: auto + required: 1 + type: number + price: + label: 'germanairlinesva.schooling::lang.member_rank.price' + span: auto + type: number + badge: + label: 'germanairlinesva.schooling::lang.member_rank.badge' + mode: file + span: auto + required: 1 + type: mediafinder + region: + label: 'germanairlinesva.schooling::lang.member_rank.region' + span: auto + required: 1 + type: text diff --git a/plugin.yaml b/plugin.yaml index 3140f07..84ae124 100644 --- a/plugin.yaml +++ b/plugin.yaml @@ -1,26 +1,26 @@ plugin: - name: 'germanairlinesva.schooling::lang.plugin.name' - description: 'germanairlinesva.schooling::lang.plugin.description' - author: 'German Airlines Va' - icon: oc-icon-university - homepage: '' + name: 'germanairlinesva.schooling::lang.plugin.name' + description: 'germanairlinesva.schooling::lang.plugin.description' + author: 'German Airlines Va' + icon: oc-icon-university + homepage: '' navigation: - main-menu-item: - label: 'germanairlinesva.schooling::lang.menu.main' - url: / - icon: icon-university - permissions: - - schooling - sideMenu: - side-menu-item: - label: 'germanairlinesva.schooling::lang.menu.typeratings' - url: germanairlinesva/schooling/typerating - icon: icon-plane - side-menu-item2: - label: 'germanairlinesva.schooling::lang.menu.rank' - url: germanairlinesva/schooling/memberRank - icon: icon-signal + main-menu-item: + label: 'germanairlinesva.schooling::lang.menu.main' + url: / + icon: icon-university + permissions: + - schooling + sideMenu: + side-menu-item: + label: 'germanairlinesva.schooling::lang.menu.typeratings' + url: germanairlinesva/schooling/typerating + icon: icon-plane + side-menu-item2: + label: 'germanairlinesva.schooling::lang.menu.rank' + url: germanairlinesva/schooling/memberRank + icon: icon-signal permissions: - schooling: - tab: 'germanairlinesva.schooling::lang.permissions.tab' - label: 'germanairlinesva.schooling::lang.permissions.label' + schooling: + tab: 'germanairlinesva.schooling::lang.permissions.tab' + label: 'germanairlinesva.schooling::lang.permissions.label' diff --git a/updates/builder_table_create_exam_questions.php b/updates/builder_table_create_exam_questions.php index 01b9f98..4c6c253 100644 --- a/updates/builder_table_create_exam_questions.php +++ b/updates/builder_table_create_exam_questions.php @@ -1,42 +1,42 @@ -create('exam_questions', function ($table) { - $table->engine = 'InnoDB'; - $table->bigIncrements('id')->unsigned(); - $table - ->bigInteger('member_rank_id') - ->unsigned() - ->nullable(); - $table - ->foreign('member_rank_id') - ->references('id') - ->on('member_ranks'); - $table - ->bigInteger('typerating_id') - ->unsigned() - ->nullable(); - $table - ->foreign('typerating_id') - ->references('id') - ->on('typeratings'); - $table->boolean('in_use'); - $table->boolean('mandatory'); - $table->text('text'); - $table->string('picture'); - }); - } - - public function down() - { - Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints(); - Schema::connection('germanairlinesva_schooling')->dropIfExists('exam_questions'); - Schema::connection('germanairlinesva_schooling')->enableForeignKeyConstraints(); - } -} +create('exam_questions', function ($table) { + $table->engine = 'InnoDB'; + $table->bigIncrements('id')->unsigned(); + $table + ->bigInteger('member_rank_id') + ->unsigned() + ->nullable(); + $table + ->foreign('member_rank_id') + ->references('id') + ->on('member_ranks'); + $table + ->bigInteger('typerating_id') + ->unsigned() + ->nullable(); + $table + ->foreign('typerating_id') + ->references('id') + ->on('typeratings'); + $table->boolean('in_use'); + $table->boolean('mandatory'); + $table->text('text'); + $table->string('picture'); + }); + } + + public function down() + { + Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints(); + Schema::connection('germanairlinesva_schooling')->dropIfExists('exam_questions'); + Schema::connection('germanairlinesva_schooling')->enableForeignKeyConstraints(); + } +} diff --git a/updates/builder_table_create_member_ranks.php b/updates/builder_table_create_member_ranks.php index d69127e..8e7ae04 100644 --- a/updates/builder_table_create_member_ranks.php +++ b/updates/builder_table_create_member_ranks.php @@ -1,28 +1,28 @@ -create('member_ranks', function ($table) { - $table->engine = 'InnoDB'; - $table->bigIncrements('id')->unsigned(); - $table->string('name'); - $table->text('description'); - $table->integer('points')->unsigned(); - $table->integer('price')->unsigned(); - $table->string('badge'); - $table->string('region'); - }); - } - - public function down() - { - Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints(); - Schema::connection('germanairlinesva_schooling')->dropIfExists('member_ranks'); - Schema::connection('germanairlinesva_schooling')->enableForeignKeyConstraints(); - } -} +create('member_ranks', function ($table) { + $table->engine = 'InnoDB'; + $table->bigIncrements('id')->unsigned(); + $table->string('name'); + $table->text('description'); + $table->integer('points')->unsigned(); + $table->integer('price')->unsigned(); + $table->string('badge'); + $table->string('region'); + }); + } + + public function down() + { + Schema::connection('germanairlinesva_schooling')->disableForeignKeyConstraints(); + Schema::connection('germanairlinesva_schooling')->dropIfExists('member_ranks'); + Schema::connection('germanairlinesva_schooling')->enableForeignKeyConstraints(); + } +}