Skip to content

Commit 08c223c

Browse files
andersbryrupandersbryrup
committed
Merge branch 'develop'
2 parents 2126bd5 + 055ba37 commit 08c223c

File tree

3 files changed

+57
-27
lines changed

3 files changed

+57
-27
lines changed

‎js/os2web_cp_service.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
var value = $('#edit-case-id').val();
1313
$('#edit-case-id').val(value.replace(/\W/g, '/'));
1414
}
15+
16+
// Reset dates if case id is entered.
17+
if($('#edit-case-id').val() || /^\d{2}\/\d/.test($('#edit-search-text').val())) {
18+
$('#edit-field-os2web-cp-service-date-from-value-datepicker-popup-0').val('');
19+
$('#edit-field-os2web-cp-service-date-to-value-datepicker-popup-0').val('');
20+
}
1521
});
1622

1723
$( "a.qtip-this[title]" ).qtip({

‎os2web_cp_service.module

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -699,22 +699,29 @@ function os2web_cp_service_field_formatter_view($entity_type, $entity, $field, $
699699
}
700700
return $element;
701701
}
702+
702703
/**
703704
* Implements hook_foorm_alter().
704705
*/
705706
function os2web_cp_service_form_alter(&$form, &$form_state, $form_id) {
706-
if ($form['#id'] == 'views-exposed-form-os2web-cp-service-cp-case-search-page' ||
707-
$form['#id'] == 'views-exposed-form-os2web-cp-service-cp-case-search-panel-pane-1' ||
708-
$form['#id'] == 'views-exposed-form-os2web-cp-service-cp-case-search-default') {
709-
foreach ($form['#info'] as &$widget) {
710-
// Adds placeholder to all textfields with a description - [email protected].
711-
if (!empty($widget['description']) && isset($form[$widget['value']]['#type']) && $form[$widget['value']]['#type'] === 'textfield') {
712-
$form[$widget['value']]['#attributes']['placeholder'] = $widget['description'];
713-
}
714-
if ($form[$widget['value']]['value']['#type'] === 'date_popup') {
715-
$form[$widget['value']]['value']['#date_format'] = 'd-m-Y';
707+
switch ($form['#id']) {
708+
case 'views-exposed-form-os2web-cp-service-cp-case-search-page':
709+
case 'views-exposed-form-os2web-cp-service-cp-case-search-panel-pane-1':
710+
case 'views-exposed-form-os2web-cp-service-cp-case-search-default':
711+
foreach ($form['#info'] as &$widget) {
712+
// Adds placeholder to all textfields with a description [email protected].
713+
if (!empty($widget['description']) && isset($form[$widget['value']]['#type']) && $form[$widget['value']]['#type'] === 'textfield') {
714+
$form[$widget['value']]['#attributes']['placeholder'] = $widget['description'];
715+
}
716+
if (isset($form[$widget['value']]['value']) && $form[$widget['value']]['value']['#type'] === 'date_popup') {
717+
$form[$widget['value']]['value']['#date_format'] = 'd-m-Y';
718+
}
716719
}
717-
}
720+
break;
721+
722+
case 'search-form':
723+
$form['#suffix'] .= '<div class="link-aaben-indsigt">Søger du efter sager i vores sagssytem, kan du bruge vores <a href="/aaben-indsigt">Åben Indsigt</a>.</div>';
724+
break;
718725
}
719726
}
720727

‎os2web_cp_service.views_default.inc

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function os2web_cp_service_views_default_views() {
148148
$handler->display->display_options['fields']['title']['id'] = 'title';
149149
$handler->display->display_options['fields']['title']['table'] = 'node';
150150
$handler->display->display_options['fields']['title']['field'] = 'title';
151-
$handler->display->display_options['fields']['title']['label'] = 'Sags titel';
151+
$handler->display->display_options['fields']['title']['label'] = 'Sagstitel';
152152
$handler->display->display_options['fields']['title']['alter']['alter_text'] = TRUE;
153153
$handler->display->display_options['fields']['title']['alter']['text'] = '[title]';
154154
$handler->display->display_options['fields']['title']['alter']['make_link'] = TRUE;
@@ -215,6 +215,10 @@ function os2web_cp_service_views_default_views() {
215215
$handler->display->display_options['sorts']['created']['field'] = 'created';
216216
$handler->display->display_options['sorts']['created']['order'] = 'DESC';
217217
$handler->display->display_options['filter_groups']['operator'] = 'OR';
218+
$handler->display->display_options['filter_groups']['groups'] = array(
219+
1 => 'AND',
220+
2 => 'AND',
221+
);
218222
/* Filterkriterie: Indhold: Udgivet */
219223
$handler->display->display_options['filters']['status']['id'] = 'status';
220224
$handler->display->display_options['filters']['status']['table'] = 'node';
@@ -368,7 +372,7 @@ return TRUE; // If no exposed inputs, remove all results
368372
t('Næste ›'),
369373
t('Sidste »'),
370374
t('Indhold entity refereret fra field_os2web_cp_service_doc_ref'),
371-
t('Sags titel'),
375+
t('Sagstitel'),
372376
t('[title]'),
373377
t('[field_os2web_cp_service_content]'),
374378
t('Dato'),
@@ -671,6 +675,13 @@ return TRUE; // If no exposed inputs, remove all results
671675
$handler->display->display_options['header']['area_text_custom']['content'] = '<h2>Sags Nr.: [field_os2web_cp_service_case_id]</h2>';
672676
$handler->display->display_options['header']['area_text_custom']['tokenize'] = TRUE;
673677
$handler->display->display_options['defaults']['fields'] = FALSE;
678+
/* Felt: Indhold: Sagstype - Sagstype */
679+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['id'] = 'field_os2web_cp_service_casetype';
680+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['table'] = 'field_data_field_os2web_cp_service_casetype';
681+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['field'] = 'field_os2web_cp_service_casetype';
682+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['label'] = '';
683+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['exclude'] = TRUE;
684+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['element_label_colon'] = FALSE;
674685
/* Felt: Ren Addresse */
675686
$handler->display->display_options['fields']['field_os2web_cp_service_address']['id'] = 'field_os2web_cp_service_address';
676687
$handler->display->display_options['fields']['field_os2web_cp_service_address']['table'] = 'field_data_field_os2web_cp_service_address';
@@ -681,17 +692,24 @@ return TRUE; // If no exposed inputs, remove all results
681692
$handler->display->display_options['fields']['field_os2web_cp_service_address']['alter']['trim_whitespace'] = TRUE;
682693
$handler->display->display_options['fields']['field_os2web_cp_service_address']['element_label_colon'] = FALSE;
683694
$handler->display->display_options['fields']['field_os2web_cp_service_address']['type'] = 'text_plain';
684-
/* Felt: Link til se alle sager */
685-
$handler->display->display_options['fields']['nothing']['id'] = 'nothing';
686-
$handler->display->display_options['fields']['nothing']['table'] = 'views';
687-
$handler->display->display_options['fields']['nothing']['field'] = 'nothing';
688-
$handler->display->display_options['fields']['nothing']['ui_name'] = 'Link til se alle sager';
689-
$handler->display->display_options['fields']['nothing']['label'] = '';
690-
$handler->display->display_options['fields']['nothing']['exclude'] = TRUE;
691-
$handler->display->display_options['fields']['nothing']['alter']['text'] = 'Se alle sager på denne addresse';
692-
$handler->display->display_options['fields']['nothing']['alter']['make_link'] = TRUE;
693-
$handler->display->display_options['fields']['nothing']['alter']['path'] = 'aaben-indsigt?search-text=[field_os2web_cp_service_address]&field_os2web_cp_service_date_from[value][date]=01-01-2007';
694-
$handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE;
695+
/* Felt: Link til se alle på addresse */
696+
$handler->display->display_options['fields']['php']['id'] = 'php';
697+
$handler->display->display_options['fields']['php']['table'] = 'views';
698+
$handler->display->display_options['fields']['php']['field'] = 'php';
699+
$handler->display->display_options['fields']['php']['ui_name'] = 'Link til se alle på addresse';
700+
$handler->display->display_options['fields']['php']['label'] = '';
701+
$handler->display->display_options['fields']['php']['exclude'] = TRUE;
702+
$handler->display->display_options['fields']['php']['alter']['make_link'] = TRUE;
703+
$handler->display->display_options['fields']['php']['alter']['path'] = 'aaben-indsigt?search-text=[field_os2web_cp_service_address]&field_os2web_cp_service_date_from[value][date]=01-01-2007';
704+
$handler->display->display_options['fields']['php']['element_label_colon'] = FALSE;
705+
$handler->display->display_options['fields']['php']['use_php_setup'] = 0;
706+
$handler->display->display_options['fields']['php']['php_output'] = '<?php
707+
$node = node_load($data->nid);
708+
if($node->field_os2web_cp_service_casetype[und][0][\'value\'] === \'EJSAG\') : ?>
709+
Se alle sager på denne addresse
710+
<?php endif; ?>';
711+
$handler->display->display_options['fields']['php']['use_php_click_sortable'] = '0';
712+
$handler->display->display_options['fields']['php']['php_click_sortable'] = '';
695713
/* Felt: Indhold: Nid */
696714
$handler->display->display_options['fields']['nid']['id'] = 'nid';
697715
$handler->display->display_options['fields']['nid']['table'] = 'node';
@@ -716,7 +734,7 @@ return TRUE; // If no exposed inputs, remove all results
716734
$handler->display->display_options['fields']['nothing_1']['table'] = 'views';
717735
$handler->display->display_options['fields']['nothing_1']['field'] = 'nothing';
718736
$handler->display->display_options['fields']['nothing_1']['label'] = 'Titel';
719-
$handler->display->display_options['fields']['nothing_1']['alter']['text'] = '[title] <br> [nothing]';
737+
$handler->display->display_options['fields']['nothing_1']['alter']['text'] = '[title] <br> [php]';
720738
$handler->display->display_options['fields']['nothing_1']['element_label_colon'] = FALSE;
721739
/* Felt: Indhold: SagsID */
722740
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['id'] = 'field_os2web_cp_service_case_id';
@@ -805,9 +823,8 @@ return TRUE; // If no exposed inputs, remove all results
805823
t('Dato'),
806824
t('Page'),
807825
t('<h2>Sags Nr.: [field_os2web_cp_service_case_id]</h2>'),
808-
t('Se alle sager på denne addresse'),
809826
t('[title] <br>[nothing]'),
810-
t('[title] <br> [nothing]'),
827+
t('[title] <br> [php]'),
811828
);
812829
$export['os2web_cp_service_cp_case_view'] = $view;
813830

0 commit comments

Comments
 (0)