Commit ddd865b4 authored by Χάρης Παπαδόπουλος's avatar Χάρης Παπαδόπουλος
Browse files

Merge branch 'component_updates' into 'develop'

updated views in order to support schools that can be selected as a unique choice

See merge request !45
parents c1d49109 b98f784d
...@@ -13,7 +13,7 @@ dependencies: ...@@ -13,7 +13,7 @@ dependencies:
- serialization - serialization
- user - user
_core: _core:
default_config_hash: X-Hp7xhmfNgEXwpE0VYHvI6BIYiDJDxGhGXtNwpeiCs default_config_hash: 7lFDDggbFVzw0CGbo37kC2WLyNHGubRf8VfvN8b5iQ0
id: coursesperschool id: coursesperschool
label: coursesperschool label: coursesperschool
module: views module: views
...@@ -368,6 +368,73 @@ display: ...@@ -368,6 +368,73 @@ display:
entity_type: eepal_school entity_type: eepal_school
entity_field: name entity_field: name
plugin_id: field plugin_id: field
special_case:
id: special_case
table: eepal_school_field_data
field: special_case
relationship: epal_id
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: 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: boolean
settings:
format: default
format_custom_true: ''
format_custom_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: eepal_school
entity_field: special_case
plugin_id: field
filters: { } filters: { }
sorts: sorts:
id_1: id_1:
...@@ -519,11 +586,8 @@ display: ...@@ -519,11 +586,8 @@ display:
name_2: name_2:
alias: epal_name alias: epal_name
raw_output: true raw_output: true
id_2: special_case:
alias: course_id alias: epal_special_case
raw_output: true
specialty_id:
alias: course_name
raw_output: true raw_output: true
path: coursesperschool/list path: coursesperschool/list
pager: pager:
......
...@@ -12,7 +12,7 @@ dependencies: ...@@ -12,7 +12,7 @@ dependencies:
- serialization - serialization
- user - user
_core: _core:
default_config_hash: jN_EIEThsJ2oXHaytnygkFnn2JT0t0QskuCm77DjmZk default_config_hash: ZHZhkwcVWVjmlZWp7DXduGPF5RhR1_GHwIV4HQXZC2w
id: regional_epal id: regional_epal
label: regional_epal label: regional_epal
module: views module: views
...@@ -214,6 +214,73 @@ display: ...@@ -214,6 +214,73 @@ display:
multi_type: separator multi_type: separator
separator: ', ' separator: ', '
field_api_classes: false field_api_classes: false
special_case:
id: special_case
table: eepal_school_field_data
field: special_case
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: 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: boolean
settings:
format: default
format_custom_true: ''
format_custom_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: eepal_school
entity_field: special_case
plugin_id: field
id: id:
id: id id: id
table: eepal_region_field_data table: eepal_region_field_data
...@@ -429,6 +496,9 @@ display: ...@@ -429,6 +496,9 @@ display:
name: name:
alias: epal_name alias: epal_name
raw_output: true raw_output: true
special_case:
alias: epal_special_case
raw_output: true
id: id:
alias: region_id alias: region_id
raw_output: true raw_output: true
......
...@@ -13,7 +13,7 @@ dependencies: ...@@ -13,7 +13,7 @@ dependencies:
- serialization - serialization
- user - user
_core: _core:
default_config_hash: fK5R5e8RHCNJLfhNG1jGBtHtSy6rExm-UquW3n8og9w default_config_hash: o0V3xnPZovHSa__1qsBLwwmvNQJ_b2iETZGlge06J9Q
id: sectorsperschool id: sectorsperschool
label: sectorsperschool label: sectorsperschool
module: views module: views
...@@ -329,6 +329,73 @@ display: ...@@ -329,6 +329,73 @@ display:
entity_type: eepal_school entity_type: eepal_school
entity_field: name entity_field: name
plugin_id: field plugin_id: field
special_case:
id: special_case
table: eepal_school_field_data
field: special_case
relationship: epal_id
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: 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: boolean
settings:
format: default
format_custom_true: ''
format_custom_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: eepal_school
entity_field: special_case
plugin_id: field
filters: { } filters: { }
sorts: sorts:
id: id:
...@@ -486,6 +553,9 @@ display: ...@@ -486,6 +553,9 @@ display:
name_1: name_1:
alias: epal_name alias: epal_name
raw_output: true raw_output: true
special_case:
alias: epal_special_case
raw_output: true
pager: pager:
type: some type: some
options: options:
......
// export const API_ENDPOINT = 'http://eduslim2.minedu.gov.gr/drupal'; // export const API_ENDPOINT = 'http://eduslim2.minedu.gov.gr/drupal';
export const API_ENDPOINT = 'http://eepal.dev/drupal'; export const API_ENDPOINT = 'http://localhost/drupal-8.2.6';
export class AppSettings { export class AppSettings {
public static get API_ENDPOINT(): string { public static get API_ENDPOINT(): string {
// return 'http://eduslim2.minedu.gov.gr/drupal'; // return 'http://eduslim2.minedu.gov.gr/drupal';
return 'http://eepal.dev/drupal'; return 'http://localhost/drupal-8.2.6';
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment