diff --git a/dist/iekserver/modules/custom/d8views/assets/css/d8viewscustomform.css b/dist/iekserver/modules/custom/d8views/assets/css/d8viewscustomform.css new file mode 100644 index 0000000000000000000000000000000000000000..8132776b30fc30bf485f55016eec36d79b44eb41 --- /dev/null +++ b/dist/iekserver/modules/custom/d8views/assets/css/d8viewscustomform.css @@ -0,0 +1,3 @@ +form.edit-eoppep-form h2.form-title{padding:15px}form.edit-eoppep-form .form-group{margin-bottom:1.2em;overflow:hidden}form.edit-eoppep-form .form-group label{float:left;width:28%;padding-right:10px;padding-top:8px;text-align:left}form.edit-eoppep-form .form-group .form-control{font-size:16px;padding:4px 8px;height:36px;width:72%;float:left;border-radius:4px !important}form.edit-eoppep-form .form-group .form-control[disabled]{background-color:grey;opacity:0.55;color:white;font-weight:bold}form.edit-eoppep-form .less-p label{padding-top:0}form.edit-eoppep-form #edit-sex--wrapper{padding-bottom:15px}form.edit-eoppep-form #edit-sex--wrapper legend{float:left;width:25%;font-size:18px;font-weight:bold;border-style:none}form.edit-eoppep-form #edit-sex--wrapper .fieldset-wrapper{float:left;width:75%}form.edit-eoppep-form #edit-sex--wrapper .fieldset-wrapper #edit-sex label{font-size:16px;font-weight:bold} + +/*# sourceMappingURL=d8viewscustomform.css.map */ diff --git a/dist/iekserver/modules/custom/d8views/config/install/d8views.editeoppep.yml b/dist/iekserver/modules/custom/d8views/config/install/d8views.editeoppep.yml new file mode 100644 index 0000000000000000000000000000000000000000..ce0075610f7140b3c37b0c62f68a06eb6a49c457 --- /dev/null +++ b/dist/iekserver/modules/custom/d8views/config/install/d8views.editeoppep.yml @@ -0,0 +1 @@ +d8views: diff --git a/dist/iekserver/modules/custom/d8views/config/install/views.view.school_administration.yml b/dist/iekserver/modules/custom/d8views/config/install/views.view.school_administration.yml new file mode 100644 index 0000000000000000000000000000000000000000..792261bba33d1c8be782019c716201e4a056360e --- /dev/null +++ b/dist/iekserver/modules/custom/d8views/config/install/views.view.school_administration.yml @@ -0,0 +1,312 @@ +langcode: el +status: true +dependencies: + config: + - system.menu.main + - user.role.administrator + - user.role.diaxeiristis_eoppep + module: + - eiek + - user +id: school_administration +label: 'School Administration' +module: views +description: '' +tag: '' +base_table: school_entity +base_field: id +core: 8.x +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: role + options: + role: + administrator: administrator + diaxeiristis_eoppep: diaxeiristis_eoppep + cache: + type: tag + options: { } + query: + type: views_query + options: + disable_sql_rewrite: false + distinct: false + replica: false + query_comment: '' + query_tags: { } + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + pager: + type: mini + options: + items_per_page: 10 + offset: 0 + id: 0 + total_pages: null + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + tags: + previous: ‹‹ + next: ›› + style: + type: table + row: + type: fields + fields: + name: + id: name + table: school_entity + field: name + relationship: none + group_type: group + admin_label: '' + label: Όνομα + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: null + entity_field: name + plugin_id: field + iekcode: + id: iekcode + table: school_entity + field: iekcode + relationship: none + group_type: group + admin_label: '' + label: 'Κωδικός ΙΕΚ' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: school_entity + entity_field: iekcode + plugin_id: field + region_id: + id: region_id + table: school_entity + field: region_id + relationship: none + group_type: group + admin_label: '' + label: Περιοχή + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: false + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: school_entity + entity_field: region_id + plugin_id: field + filters: { } + sorts: { } + title: 'Κατάλογος ΙΕΚ' + header: { } + footer: { } + empty: { } + relationships: { } + arguments: { } + display_extenders: { } + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + - user.roles + tags: { } + page_1: + display_plugin: page + id: page_1 + display_title: Page + position: 1 + display_options: + display_extenders: { } + path: iek/list + menu: + type: normal + title: 'Κατάλογος ΙΕΚ' + description: '' + expanded: false + parent: '' + weight: 15 + context: '0' + menu_name: main + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url.query_args + - user.roles + tags: { } diff --git a/dist/iekserver/modules/custom/d8views/config/install/views.view.test1.yml b/dist/iekserver/modules/custom/d8views/config/install/views.view.test1.yml index bfff37aa686b585995d4d89e48c84fc7a11c58c7..ed584cbda8fa58c802c6170ca6bb34ac9ec07a7d 100644 --- a/dist/iekserver/modules/custom/d8views/config/install/views.view.test1.yml +++ b/dist/iekserver/modules/custom/d8views/config/install/views.view.test1.yml @@ -2,6 +2,7 @@ langcode: el status: true dependencies: config: + - system.menu.main - user.role.administrator - user.role.aiton - user.role.diaxeiristis_eoppep @@ -12,7 +13,7 @@ dependencies: - options - user _core: - default_config_hash: ydoWWedQpcFchSKjigiTbiPk2Q9yteXJ-pEWdo_crbs + default_config_hash: nPtUcnOvP5zc9D4jN9MXA8-2Sl6UpZa2W28diO6JM98 id: test1 label: 'Aitiseis Administration' module: views @@ -61,7 +62,7 @@ display: items_per_page: 10 offset: 0 id: 0 - total_pages: 4 + total_pages: null tags: previous: ‹‹ next: ›› @@ -88,53 +89,54 @@ display: summary: '' description: '' columns: - edit_aitisi_entity: edit_aitisi_entity + id: id + baseurlvalue: baseurlvalue + id_1: id_1 last: last first: first - fname: fname - mname: mname iek_id: iek_id flagbank: flagbank flagiek: flagiek state: state + nothing: nothing info: - edit_aitisi_entity: - sortable: false + id: + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - last: + baseurlvalue: sortable: false default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - first: + id_1: sortable: false - default_sort_order: desc + default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - fname: - sortable: false + last: + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' - mname: + first: sortable: false - default_sort_order: asc + default_sort_order: desc align: '' separator: '' empty_column: false responsive: '' iek_id: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' @@ -155,6 +157,13 @@ display: empty_column: false responsive: '' state: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + nothing: sortable: false default_sort_order: asc align: '' @@ -738,8 +747,8 @@ display: relationship: none group_type: group admin_label: '' - label: '' - exclude: true + label: 'Αίτηση ID' + exclude: false alter: alter_text: false text: '' @@ -797,8 +806,74 @@ display: entity_type: aitisi_entity entity_field: id plugin_id: field - nothing: - id: nothing + id_1: + id: id_1 + table: student_entity + field: id + relationship: student_id + group_type: group + admin_label: '' + label: ID + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: number_integer + settings: + thousand_separator: '' + prefix_suffix: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + entity_type: student_entity + entity_field: id + plugin_id: field + nothing_1: + id: nothing_1 table: views field: nothing relationship: none @@ -808,7 +883,7 @@ display: exclude: false alter: alter_text: true - text: "\n\n" + text: '' make_link: false path: '' absolute: false @@ -1314,7 +1389,7 @@ display: exclude: false alter: alter_text: true - text: '{{ last }} {{ first }}' + text: '{{ last }} {{ first }}' make_link: false path: '' absolute: false @@ -1354,61 +1429,12 @@ display: text: προβολή entity_type: student_entity plugin_id: entity_link - rendered_entity: - id: rendered_entity - table: student_entity - field: rendered_entity - relationship: student_id - group_type: group - admin_label: '' - label: 'Απεικονιζόμενη οντότητα' - exclude: true - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: true - view_mode: default - entity_type: student_entity - plugin_id: rendered_entity defaults: fields: false filters: false filter_groups: false + sorts: false + use_ajax: false filters: iekcode: id: iekcode @@ -1452,6 +1478,22 @@ display: operator: AND groups: 1: AND + sorts: + id: + id: id + table: aitisi_entity + field: id + relationship: none + group_type: group + admin_label: '' + order: ASC + exposed: false + expose: + label: '' + entity_type: aitisi_entity + entity_field: id + plugin_id: standard + use_ajax: false cache_metadata: max-age: 0 contexts: @@ -1476,8 +1518,8 @@ display: relationship: none group_type: group admin_label: '' - label: '' - exclude: true + label: Αρ.Αίτησης + exclude: false alter: alter_text: false text: '' @@ -1585,63 +1627,14 @@ display: hide_alter_empty: true entity_type: aitisi_entity plugin_id: baseurlvalue - nothing: - id: nothing - table: views - field: nothing - relationship: none - group_type: group - admin_label: '' - label: '' - exclude: false - alter: - alter_text: true - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: false - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: false - empty_zero: false - hide_alter_empty: false - plugin_id: custom - last: - id: last + id_1: + id: id_1 table: student_entity - field: last + field: id relationship: student_id group_type: group admin_label: '' - label: 'Last Name' + label: '' exclude: true alter: alter_text: false @@ -1674,7 +1667,7 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: true + element_label_colon: false element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true @@ -1683,9 +1676,10 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: value - type: string + type: number_integer settings: - link_to_entity: false + thousand_separator: '' + prefix_suffix: true group_column: value group_columns: { } group_rows: true @@ -1697,20 +1691,20 @@ display: separator: ', ' field_api_classes: false entity_type: student_entity - entity_field: last + entity_field: id plugin_id: field - first: - id: first - table: student_entity - field: first - relationship: student_id + nothing: + id: nothing + table: views + field: nothing + relationship: none group_type: group admin_label: '' - label: Ονοματεπώνυπο + label: '' exclude: false alter: alter_text: true - text: '{{ last }} {{ first }}' + text: '' make_link: false path: '' absolute: false @@ -1739,39 +1733,23 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: true + element_label_colon: false element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true empty: '' hide_empty: false empty_zero: false - hide_alter_empty: true - click_sort_column: value - type: string - settings: - link_to_entity: false - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false - entity_type: student_entity - entity_field: first - plugin_id: field - fname: - id: fname + hide_alter_empty: false + plugin_id: custom + last: + id: last table: student_entity - field: fname + field: last relationship: student_id group_type: group admin_label: '' - label: Πατρώνυμο + label: Επίθετο exclude: false alter: alter_text: false @@ -1804,7 +1782,7 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: true + element_label_colon: false element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true @@ -1827,20 +1805,20 @@ display: separator: ', ' field_api_classes: false entity_type: student_entity - entity_field: fname + entity_field: last plugin_id: field - mname: - id: mname + first: + id: first table: student_entity - field: mname + field: first relationship: student_id group_type: group admin_label: '' - label: 'Όνομα μητέρας' + label: Όνομα exclude: false alter: alter_text: false - text: '' + text: '{{ last }} {{ first }}' make_link: false path: '' absolute: false @@ -1869,7 +1847,7 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: true + element_label_colon: false element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true @@ -1892,7 +1870,7 @@ display: separator: ', ' field_api_classes: false entity_type: student_entity - entity_field: mname + entity_field: first plugin_id: field iek_id: id: iek_id @@ -2104,7 +2082,7 @@ display: exclude: false alter: alter_text: true - text: "{% if state =='DRAFT' %}\n  Αρχική\n{% elseif state =='Pending' %}\n Υπο επεξεργασία\n{% else %}\n Έτοιμη\n{% endif %}" + text: "{% if state =='DRAFT' %}\n  Αρχική\n{% elseif state =='PENDING' %}\n Υπο επεξεργασία\n{% else %}\n Έτοιμη\n{% endif %}" make_link: false path: '' absolute: false @@ -2160,12 +2138,41 @@ display: defaults: fields: false access: false + filters: false + filter_groups: false + exposed_form: false + title: false access: type: role options: role: administrator: administrator diaxeiristis_eoppep: diaxeiristis_eoppep + filters: { } + filter_groups: + operator: AND + groups: + 1: AND + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + title: 'Κατάλογος αιτήσεων' + menu: + type: normal + title: 'Κατάλογος Αιτήσεων' + description: '' + expanded: false + parent: '' + weight: 20 + context: '0' + menu_name: main cache_metadata: max-age: 0 contexts: @@ -2189,6 +2196,9 @@ display: row: false fields: false access: false + filters: false + filter_groups: false + header: false path: aitisi/% arguments: id: @@ -2350,7 +2360,7 @@ display: html: false element_type: '' element_class: '' - element_label_type: h3 + element_label_type: div element_label_class: '' element_label_colon: true element_wrapper_type: '' @@ -2415,7 +2425,7 @@ display: html: false element_type: '' element_class: '' - element_label_type: h3 + element_label_type: div element_label_class: '' element_label_colon: true element_wrapper_type: '' @@ -2480,7 +2490,7 @@ display: html: false element_type: '' element_class: '' - element_label_type: h3 + element_label_type: div element_label_class: '' element_label_colon: true element_wrapper_type: '' @@ -2545,7 +2555,7 @@ display: html: false element_type: '' element_class: '' - element_label_type: h3 + element_label_type: div element_label_class: '' element_label_colon: true element_wrapper_type: '' @@ -2610,7 +2620,7 @@ display: html: false element_type: '' element_class: '' - element_label_type: h3 + element_label_type: div element_label_class: '' element_label_colon: true element_wrapper_type: '' @@ -2675,7 +2685,7 @@ display: html: false element_type: '' element_class: '' - element_label_type: h3 + element_label_type: div element_label_class: '' element_label_colon: true element_wrapper_type: '' @@ -2740,7 +2750,7 @@ display: html: false element_type: '' element_class: '' - element_label_type: h3 + element_label_type: div element_label_class: '' element_label_colon: false element_wrapper_type: '' @@ -2805,7 +2815,7 @@ display: html: false element_type: '' element_class: '' - element_label_type: h3 + element_label_type: div element_label_class: '' element_label_colon: true element_wrapper_type: '' @@ -2843,7 +2853,7 @@ display: exclude: false alter: alter_text: true - text: "{% if state =='DRAFT' %}\n Αρχική\n{% elseif state =='Pending' %}\nΥπο επεξεργασία\n{% else %}\nΈτοιμη\n{% endif %}" + text: "{% if state =='DRAFT' %}\r\n Αρχική\r\n{% elseif state =='Pending' %}\r\nΥπο επεξεργασία\r\n{% else %}\r\nΈτοιμη\r\n{% endif %}" make_link: false path: '' absolute: false @@ -2870,7 +2880,7 @@ display: html: false element_type: '' element_class: '' - element_label_type: h3 + element_label_type: div element_label_class: '' element_label_colon: true element_wrapper_type: '' @@ -2902,6 +2912,66 @@ display: role: administrator: administrator aiton: aiton + filters: + user_id: + id: user_id + table: aitisi_entity + field: user_id + relationship: none + group_type: group + admin_label: '' + operator: '=' + value: + min: '' + max: '' + value: test + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + entity_type: aitisi_entity + entity_field: user_id + plugin_id: numeric + filter_groups: + operator: AND + groups: + 1: AND + header: + area: + id: area + table: views + field: area + relationship: none + group_type: group + admin_label: '' + empty: false + tokenize: false + content: + value: 'Η αίτηση μου' + format: full_html + plugin_id: text cache_metadata: max-age: -1 contexts: diff --git a/dist/iekserver/modules/custom/d8views/d8views.info.yml b/dist/iekserver/modules/custom/d8views/d8views.info.yml index d19a612a30dac1bc1566336ded8c285f35af5646..43514c52d5cc275c44fa26b8c4bb8b68aab0a4ec 100644 --- a/dist/iekserver/modules/custom/d8views/d8views.info.yml +++ b/dist/iekserver/modules/custom/d8views/d8views.info.yml @@ -5,4 +5,5 @@ core: 8.x package: Custom dependencies: - eiek - - entitychanger \ No newline at end of file + - entitychanger + diff --git a/dist/iekserver/modules/custom/d8views/d8views.libraries.yml b/dist/iekserver/modules/custom/d8views/d8views.libraries.yml new file mode 100644 index 0000000000000000000000000000000000000000..e514905b1e380144b9d3a0139ff6393df119778d --- /dev/null +++ b/dist/iekserver/modules/custom/d8views/d8views.libraries.yml @@ -0,0 +1,10 @@ +modal: + css: + theme: + assets/css/d8viewscustomform.css: {} + js: + js/crutch.js: {} + dependencies: + - core/jquery + - core/ajax + diff --git a/dist/iekserver/modules/custom/d8views/d8views.module b/dist/iekserver/modules/custom/d8views/d8views.module index 43117a4e2de6fcb674d3756703b7c9d2a7364037..cba018b3ff865f2c299a4b8e846cca4b95cef5e8 100644 --- a/dist/iekserver/modules/custom/d8views/d8views.module +++ b/dist/iekserver/modules/custom/d8views/d8views.module @@ -23,6 +23,12 @@ function d8views_help($route_name, RouteMatchInterface $route_match) { } } +function d8views_preprocess_html(&$variables) { + $variables['page']['#attached']['library'][] = 'd8views/modal'; + $variables['page']['#attached']['library'][] = 'core/drupal.ajax'; +} + + /** * Implements hook_theme(). */ @@ -35,5 +41,8 @@ function d8views_theme() { 'edit_iek_form' => [ 'render element' => 'form', ], + 'edit_eoppep_form' => [ + 'render element' => 'form', + ], ]; } diff --git a/dist/iekserver/modules/custom/d8views/d8views.routing.yml b/dist/iekserver/modules/custom/d8views/d8views.routing.yml index b8c57a78f6c86deef44b0a88ca1c1c40824a2478..33db4ba1d428db198794279a5e8a7c404d92f6ef 100644 --- a/dist/iekserver/modules/custom/d8views/d8views.routing.yml +++ b/dist/iekserver/modules/custom/d8views/d8views.routing.yml @@ -6,3 +6,12 @@ d8views.edit_iek_form: _title: 'EditIekForm' requirements: _access: 'TRUE' + +d8views.edit_eoppep_form: + path: '/eoppep/aitisi/{aid}/edit' + defaults: + _form: '\Drupal\d8views\Form\EditEoppepForm' + _title: 'EditEoppepForm' + requirements: + _access: 'TRUE' + diff --git a/dist/iekserver/modules/custom/d8views/d8views.views_execution.inc b/dist/iekserver/modules/custom/d8views/d8views.views_execution.inc index 887648a93d00ec4795432933567ad7c3ba72cc70..6d397190fdbecff9d3c91a740f257ad9360eadc1 100644 --- a/dist/iekserver/modules/custom/d8views/d8views.views_execution.inc +++ b/dist/iekserver/modules/custom/d8views/d8views.views_execution.inc @@ -5,7 +5,7 @@ if ($view->id() == 'test1') { foreach ($query->where as &$condition_group) { foreach ($condition_group['conditions'] as &$condition) { - + // dpm($condition); if ($condition['field'] == 'school_entity_aitisi_entity.iekcode') { $user = \Drupal::service('current_user'); @@ -20,6 +20,23 @@ if ($view->id() == 'test1') { 'operator' => '=', ); } + + if ($condition['field'] == 'aitisi_entity.user_id') { + + $user = \Drupal::service('current_user'); + $uid = $user->id(); + //$formatted_name = $user->getDisplayName(); + //$raw_name = $user->getAccountName(); + //$raw_name = 'admin'; + + $condition = array( + 'field' => 'aitisi_entity.user_id', + 'value' => $uid, + 'operator' => '=', + ); + } + + } } } diff --git a/dist/iekserver/modules/custom/d8views/js/crutch.js b/dist/iekserver/modules/custom/d8views/js/crutch.js new file mode 100644 index 0000000000000000000000000000000000000000..2f9e7eb845f82fb467f0c8cd30800ad06490c4e9 --- /dev/null +++ b/dist/iekserver/modules/custom/d8views/js/crutch.js @@ -0,0 +1,31 @@ +(function ($, Drupal, settings) { + + "use strict"; + + Drupal.behaviors.Crutch = { //the name of our behavior + attach: function (context, settings) { + function strip_tags(input, allowed) { //the strip_tags function that cuts unnecessary tags on regular expression and returns clean text. Important! The input parameter works correctly only string data type. + allowed = (((allowed || '') + '') + .toLowerCase() + .match(/<[a-z][a-z0-9]*>/g) || []) + .join(''); + var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi, + commentsAndPhpTags = /|<\?(?:php)?[\s\S]*?\?>/gi; + return input.replace(commentsAndPhpTags, '') + .replace(tags, function($0, $1) { + return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''; + }); + } + $(document).bind('ajaxSuccess.Crutch', function() { //run the main code only after Ajax has successfully downloaded your node + var value = $(".ui-dialog-title"); //matching the popup title class + + if (value.length && !value.hasClass('do-once')) { //if there is no do-once class, + var text = strip_tags($(value).text()); //then run the strip_tags() function + $(value).text(text); + value.addClass('do-once'); + } + $(this).unbind('ajaxSuccess.Crutch'); + }); + } + }; +})(jQuery, Drupal, drupalSettings); diff --git a/dist/iekserver/modules/custom/d8views/src/Form/EditEoppepForm.php b/dist/iekserver/modules/custom/d8views/src/Form/EditEoppepForm.php new file mode 100644 index 0000000000000000000000000000000000000000..2a378462721a55642c304faa9f28f52c13e62baf --- /dev/null +++ b/dist/iekserver/modules/custom/d8views/src/Form/EditEoppepForm.php @@ -0,0 +1,314 @@ +entityManager = $entity_manager; + } + + public static function create(ContainerInterface $container) { + return new static( + $container->get('entity.manager') + ); + } + + + /** + * {@inheritdoc} + */ + public function getFormId() { + return 'edit_eoppep_form'; + } + + /** + * {@inheritdoc} + */ + public function buildForm(array $form, FormStateInterface $form_state, $aid = NULL) { + + if(isset($aid)) { + $entity_manager = \Drupal::entityManager(); + + $entity_storage_aitisi = $entity_manager->getStorage('aitisi_entity'); + + + + $aitisiArr = $entity_storage_aitisi->loadByProperties(['id' => $aid]); + $this->entityObject = reset($aitisiArr); + + //get the student entity + $this->studentObject = $this->entityObject->getStudent(); + + if ($this->entityObject) { + + $form['#theme'] = 'edit_eoppep_form'; + + + $form['numbek'] = [ + '#type' => 'textfield', + '#title' => t('Αριθμός ΒΕΚ'), + '#default_value' => $this->entityObject->getNumbek() ? $this->entityObject->getNumbek() : '', + '#states' => array( + 'disabled' => array( + 'input[name="numbek"]' => array('filled' => TRUE), + ), + ), + ]; + + $form['prabek'] = [ + '#type' => 'textfield', + '#title' => t('Πράξη ΒΕΚ'), + '#default_value' => $this->entityObject->getPrabek() ? $this->entityObject->getPrabek() : '', + '#states' => array( + 'disabled' => array( + 'input[name="prabek"]' => array('filled' => TRUE), + ), + ), + ]; + + $form['regno'] = [ + '#type' => 'textfield', + '#title' => t('ΑΜΚ'), + '#default_value' => $this->entityObject->getRegno() ? $this->entityObject->getRegno() : '', + '#states' => array( + 'disabled' => array( + 'input[name="regno"]' => array('filled' => TRUE), + ), + ), + ]; + + $form['flagiek'] = array( + '#type' => 'radios', + '#title' => t('Έλεγχος ΙΕΚ'), + '#options' => array(0 => t('Αρχική'), 1 => t('Έλεγχος ολοκληρώθηκε')), + '#default_value' => $this->entityObject->getFlagiek() ? $this->entityObject->getFlagiek() : '', + ); + + + if(!$this->entityObject->getFlagbank()) { + $form['flagbank'] = array( + '#type' => 'radios', + '#title' => t('Έλεγχος Τράπεζας'), + '#options' => array(0 => t('Αρχική'), 1 => t('Έλεγχος ολοκληρώθηκε')), + '#default_value' => $this->entityObject->getFlagbank() ? $this->entityObject->getFlagbank() : '', + ); + } + + $form['last'] = array( + '#type' => 'textfield', + '#title' => t('Επιθετο'), + '#size' => 60, + '#maxlength' => 120, + '#required' => TRUE, + '#default_value' => $this->studentObject->getLast() ? $this->studentObject->getLast():'', + '#states' => array( + 'disabled' => array( + 'input[name="last"]' => array('filled' => TRUE), + ), + ), + ); + + $form['first'] = array( + '#type' => 'textfield', + '#title' => t('Όνομα'), + '#size' => 60, + '#maxlength' => 120, + '#required' => TRUE, + '#default_value' => $this->studentObject->getFirst() ? $this->studentObject->getFirst():'', + '#states' => array( + 'disabled' => array( + 'input[name="first"]' => array('filled' => TRUE), + ), + ), + ); + + $form['fname'] = array( + '#type' => 'textfield', + '#title' => t('Όνομα πατέρα'), + '#size' => 60, + '#maxlength' => 120, + '#required' => TRUE, + '#default_value' => $this->studentObject->getFname() ? $this->studentObject->getFname():'', + '#states' => array( + 'disabled' => array( + 'input[name="fname"]' => array('filled' => TRUE), + ), + ), + ); + + $form['mname'] = array( + '#type' => 'textfield', + '#title' => t('Όνομα μητέρας'), + '#size' => 60, + '#maxlength' => 120, + '#required' => TRUE, + '#default_value' => $this->studentObject->getMname() ? $this->studentObject->getMname():'', + '#states' => array( + 'disabled' => array( + 'input[name="mname"]' => array('filled' => TRUE), + ), + ), + ); + + $form['idno'] = array( + '#type' => 'textfield', + '#title' => t('Αριθμός ταυτότητας'), + '#size' => 8, + '#maxlength' => 25, + '#required' => TRUE, + '#default_value' => $this->studentObject->getIdno() ? $this->studentObject->getIdno():'', + '#states' => array( + 'disabled' => array( + 'input[name="idno"]' => array('filled' => TRUE), + ), + ), + ); + + $form['sex'] = array( + '#type' => 'radios', + '#title' => t('Φυλο'), + //'#default_value' => $studentObject->getSex() ? $studentObject->getSex():'', + '#default_value' => 1, + '#options' => array(0 => t('Άνδρας'), 1 => t('Γυναίκα')), + '#states' => array( + 'disabled' => array( + 'input[name="sex"]' => array('filled' => TRUE), + ), + ), + ); + + $form['birth_date'] = array( + '#type' => 'date', + '#title' => t('Ημερομηνία Γέννησης'), + '#default_value' => $this->studentObject->getBirthdate() ? $this->studentObject->getBirthdate():'', + '#states' => array( + 'disabled' => array( + 'input[name="birth_date"]' => array('filled' => TRUE), + ), + //'#default_value' => array('year' => 2020, 'month' => 2, 'day' => 15,) + // '#default_value' => '2016-01-27' + ), + ); + + $form['birth_place'] = array( + '#type' => 'textfield', + '#title' => t('Τοποθεσία Γέννησης'), + '#size' => 60, + '#maxlength' => 120, + '#required' => TRUE, + '#default_value' => $this->studentObject->getBirthplace() ? $this->studentObject->getBirthplace():'', + '#states' => array( + 'disabled' => array( + 'input[name="birth_place"]' => array('filled' => TRUE), + ), + ), + ); + + $form['email'] = array( + '#type' => 'email', + '#title' => t('Email'), + '#default_value' => $this->studentObject->getEmail() ? $this->studentObject->getEmail():'', + ); + + $form['telephone'] = array( + '#type' => 'tel', + '#title' => t('Τηλέφωνο'), + '#default_value' => $this->studentObject->getTelephone() ? $this->studentObject->getTelephone():'', + ); + + $form['afm'] = array( + '#type' => 'textfield', + '#title' => t('ΑΦΜ'), + '#size' => 30, + '#maxlength' => 30, + '#required' => TRUE, + '#default_value' => $this->studentObject->getAfm() ? $this->studentObject->getAfm():'', + '#states' => array( + 'disabled' => array( + 'input[name="afm"]' => array('filled' => TRUE), + ), + ), + ); + + + $form['submit'] = [ + '#type' => 'submit', + '#value' => $this->t('Submit'), + ]; + + + + } + + + + } + + + return $form; + } + + /** + * {@inheritdoc} + */ + public function validateForm(array &$form, FormStateInterface $form_state) { + parent::validateForm($form, $form_state); + } + + /** + * {@inheritdoc} + */ + public function submitForm(array &$form, FormStateInterface $form_state) { + // Display result. + + + //save telephone and email update the check for bank to true + $this->studentObject->setTelephone($form_state->getValue('telephone')); + $this->studentObject->setEmail($form_state->getValue('email')); + + //check the initial check bank value + $initial = $this->entityObject->getFlagbank(); + if(!$initial) { + $this->entityObject->setFlagbank(1); + //change the current STATE + if($this->entityObject->getState() == 'DRAFT') { + $this->entityObject->setState('PENDING'); + } else if($this->entityObject->getState() == 'PENDING') { + $this->entityObject->setState('READY'); + } + } + + $this->studentObject->save(); + $this->entityObject->save(); + + $url = Url::fromUserInput('/data/aitiseis/eoppep'); + $form_state->setRedirectUrl($url); + + } + +} diff --git a/dist/iekserver/modules/custom/d8views/src/Form/EditIekForm.php b/dist/iekserver/modules/custom/d8views/src/Form/EditIekForm.php index 868183742c4803e8fcf9181b4113bbf5fa72edba..9aa2179a3e3b1840086b5a01ac5fa0e97c8550a9 100644 --- a/dist/iekserver/modules/custom/d8views/src/Form/EditIekForm.php +++ b/dist/iekserver/modules/custom/d8views/src/Form/EditIekForm.php @@ -62,6 +62,9 @@ class EditIekForm extends FormBase { $form['#theme'] = 'edit_iek_form'; + //keep the current flagiek value from object + $currentFlagIek = $this->entityObject->getFlagiek(); + $form['numbek'] = [ '#type' => 'textfield', '#title' => t('Αριθμός ΒΕΚ'), @@ -70,6 +73,7 @@ class EditIekForm extends FormBase { '#states' => array( 'disabled' => array( 'input[name="flagiek"]' => array('value' => 1), + $currentFlagIek => array('value' => 1), ), ) ]; @@ -80,7 +84,7 @@ class EditIekForm extends FormBase { '#required' => TRUE, '#default_value' => $this->entityObject->getPrabek() ? $this->entityObject->getPrabek() : '', '#states' => array( - 'disabled' => array( + 'disabled' => array( 'input[name="flagiek"]' => array('value' => 1), ), ) @@ -98,19 +102,18 @@ class EditIekForm extends FormBase { ) ]; - $form['flagiek'] = array( + if(!$this->entityObject->getFlagiek()) { + + $form['flagiek'] = array( '#type' => 'radios', - '#title' => t('Έλεγχος ΙΕΚ'), - '#default_value' => 0, + '#title' => t('Έλεγχος ΙΕΚ'), '#options' => array(0 => t('Αρχική'), 1 => t('Έλεγχος ολοκληρώθηκε')), '#default_value' => $this->entityObject->getFlagiek() ? $this->entityObject->getFlagiek() : '', - '#states' => array( - 'disabled' => array( - 'input[name="flagiek"]' => array('value' => 1), - ), - ) ); + } + + $form['submit'] = [ '#type' => 'submit', @@ -135,6 +138,8 @@ class EditIekForm extends FormBase { */ public function validateForm(array &$form, FormStateInterface $form_state) { parent::validateForm($form, $form_state); + + } /** @@ -142,14 +147,27 @@ class EditIekForm extends FormBase { */ public function submitForm(array &$form, FormStateInterface $form_state) { // Display result. - foreach ($form_state->getValues() as $key => $value) { - drupal_set_message($key . ': ' . $value); - } + //foreach ($form_state->getValues() as $key => $value) { + // drupal_set_message($key . ': ' . $value); + //} $this->entityObject->setNumbek($form_state->getValue('numbek')); $this->entityObject->setPrabek($form_state->getValue('prabek')); $this->entityObject->setRegno($form_state->getValue('regno')); - $this->entityObject->setFlagiek($form_state->getValue('flagiek')); + + //get + $initial = $this->entityObject->getFlagiek(); + if(!$initial) { + $this->entityObject->setFlagiek(1); + if($this->entityObject->getState() == 'DRAFT') { + $this->entityObject->setState('PENDING'); + } else if($this->entityObject->getState() == 'PENDING') { + $this->entityObject->setState('READY'); + } + } + + + $this->entityObject->save(); $url = Url::fromUserInput('/data/aitiseis/iek'); diff --git a/dist/iekserver/modules/custom/d8views/templates/edit-eoppep-form.html.twig b/dist/iekserver/modules/custom/d8views/templates/edit-eoppep-form.html.twig new file mode 100644 index 0000000000000000000000000000000000000000..44c5194bc06bb58cfeb825e4b56b3b8e7030715d --- /dev/null +++ b/dist/iekserver/modules/custom/d8views/templates/edit-eoppep-form.html.twig @@ -0,0 +1,74 @@ +{{ attach_library('d8views/modal') }} + + {{ form.form_build_id }} + {{ form.form_token }} + {{ form.form_id }} +

Προσωπικά Στοιχεία

+
+
+ {{ form.last }} +
+
+ {{ form.first }} +
+
+ {{ form.fname }} +
+
+ {{ form.mname }} +
+
+
+
+ {{ form.idno }} +
+
+ {{ form.afm }} +
+
+
+
+ {{ form.email }} +
+
+ {{ form.birth_place }} +
+
+
+
+ {{ form.birth_date }} +
+
+ {{ form.telephone }} +
+
+ {{ form.sex }} +
+
+

Στοιχεία Αίτησης

+
+
+
+ {{ form.prabek }} +
+
+ {{ form.numbek }} +
+
+
+
+ {{ form.regno }} +
+
+
+
+ {{ form.flagbank }} +
+
+
+
+
+ {{ form.submit }} +
+
+ \ No newline at end of file