Skip to content

Commit 8b38564

Browse files
andersbryrupandersbryrup
committed
Merge branch 'develop' of github.com:OS2web/os2web_cp_service into develop
2 parents bed3225 + 0585a01 commit 8b38564

File tree

4 files changed

+115
-48
lines changed

4 files changed

+115
-48
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: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ function os2web_cp_service_alter_configuration($key, $value) {
151151
* TRUE on successful content creation.
152152
*/
153153
function os2web_cp_service_create_case(array $data) {
154-
155-
watchdog('os2web_cp_service', 'CP case start: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
156154
// Prepare data.
157155
$data = array_replace_recursive(os2web_cp_service_default_case(), $data);
158156

@@ -172,7 +170,6 @@ function os2web_cp_service_create_case(array $data) {
172170
else {
173171
$node = node_load(array_pop($nids));
174172
}
175-
watchdog('os2web_cp_service', 'CP old deleted: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
176173

177174
// See if the triggered rules on the published node, is approved
178175
// in the vocabulary. Otherwise the node will be unpublished.
@@ -220,7 +217,12 @@ function os2web_cp_service_create_case(array $data) {
220217

221218
switch ($field_info['type']) {
222219
case 'text':
223-
$node->{$field_name}[LANGUAGE_NONE][0]['value'] = (string) $data['fields'][$field['label']];
220+
if ($field['label'] === 'Sagstitel') {
221+
$node->{$field_name}[LANGUAGE_NONE][0]['value'] = (string) preg_replace('/\s\(\d{4}\)/', '', $data['fields']['Sagstitel']);
222+
}
223+
else {
224+
$node->{$field_name}[LANGUAGE_NONE][0]['value'] = (string) $data['fields'][$field['label']];
225+
}
224226
break;
225227

226228
case 'taxonomy_term_reference':
@@ -279,7 +281,6 @@ function os2web_cp_service_create_case(array $data) {
279281
try {
280282
node_submit($node);
281283
node_save($node);
282-
watchdog('os2web_cp_service', 'CP case done: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
283284
return TRUE;
284285
}
285286
catch (Exception $e) {
@@ -401,8 +402,6 @@ function os2web_cp_service_default_case() {
401402
* TRUE on successful content creation.
402403
*/
403404
function os2web_cp_service_create_document(array $data) {
404-
405-
watchdog('os2web_cp_service', 'CP document start: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
406405
$data = array_replace_recursive(os2web_cp_service_default_document(), $data);
407406
// Prepare data.
408407
$query = new EntityFieldQuery();
@@ -421,7 +420,6 @@ function os2web_cp_service_create_document(array $data) {
421420
else {
422421
$node = node_load(array_pop($nids));
423422
}
424-
watchdog('os2web_cp_service', 'CP old deleted: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
425423

426424
// See if the triggered rules on the published node, is approved
427425
// in the vocabulary. Otherwise the node will be unpublished.
@@ -520,7 +518,6 @@ function os2web_cp_service_create_document(array $data) {
520518
}
521519
}
522520
}
523-
watchdog('os2web_cp_service', 'CP document done: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
524521
return TRUE;
525522
}
526523

@@ -702,22 +699,29 @@ function os2web_cp_service_field_formatter_view($entity_type, $entity, $field, $
702699
}
703700
return $element;
704701
}
702+
705703
/**
706704
* Implements hook_foorm_alter().
707705
*/
708706
function os2web_cp_service_form_alter(&$form, &$form_state, $form_id) {
709-
if ($form['#id'] == 'views-exposed-form-os2web-cp-service-cp-case-search-page' ||
710-
$form['#id'] == 'views-exposed-form-os2web-cp-service-cp-case-search-panel-pane-1' ||
711-
$form['#id'] == 'views-exposed-form-os2web-cp-service-cp-case-search-default') {
712-
foreach ($form['#info'] as &$widget) {
713-
// Adds placeholder to all textfields with a description - [email protected].
714-
if (!empty($widget['description']) && isset($form[$widget['value']]['#type']) && $form[$widget['value']]['#type'] === 'textfield') {
715-
$form[$widget['value']]['#attributes']['placeholder'] = $widget['description'];
716-
}
717-
if ($form[$widget['value']]['value']['#type'] === 'date_popup') {
718-
$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+
}
719719
}
720-
}
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;
721725
}
722726
}
723727

‎os2web_cp_service.pages_default.inc

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,36 @@ function os2web_cp_service_default_page_manager_handlers() {
5454
),
5555
);
5656
$display->cache = array();
57-
$display->title = '%node:title';
57+
$display->title = '';
5858
$display->content = array();
5959
$display->panels = array();
6060
$pane = new stdClass();
6161
$pane->pid = 'new-1';
6262
$pane->panel = 'center';
63+
$pane->type = 'custom';
64+
$pane->subtype = 'custom';
65+
$pane->shown = TRUE;
66+
$pane->access = array();
67+
$pane->configuration = array(
68+
'admin_title' => 'Gå tilbage',
69+
'title' => '',
70+
'body' => '<a href="javascript:history.go(-1)">Gå tilbage til søgning</a>',
71+
'format' => 'full_html',
72+
'substitute' => 1,
73+
);
74+
$pane->cache = array();
75+
$pane->style = array(
76+
'settings' => NULL,
77+
);
78+
$pane->css = array();
79+
$pane->extras = array();
80+
$pane->position = 0;
81+
$pane->locks = array();
82+
$display->content['new-1'] = $pane;
83+
$display->panels['center'][0] = 'new-1';
84+
$pane = new stdClass();
85+
$pane->pid = 'new-2';
86+
$pane->panel = 'center';
6387
$pane->type = 'views';
6488
$pane->subtype = 'os2web_cp_service_cp_case_view';
6589
$pane->shown = TRUE;
@@ -89,10 +113,10 @@ function os2web_cp_service_default_page_manager_handlers() {
89113
);
90114
$pane->css = array();
91115
$pane->extras = array();
92-
$pane->position = 0;
116+
$pane->position = 1;
93117
$pane->locks = array();
94-
$display->content['new-1'] = $pane;
95-
$display->panels['center'][0] = 'new-1';
118+
$display->content['new-2'] = $pane;
119+
$display->panels['center'][1] = 'new-2';
96120
$display->hide_title = PANELS_TITLE_FIXED;
97121
$display->title_pane = '0';
98122
$handler->conf['display'] = $display;
@@ -146,7 +170,7 @@ function os2web_cp_service_default_page_manager_handlers() {
146170
$display->content = array();
147171
$display->panels = array();
148172
$pane = new stdClass();
149-
$pane->pid = 'new-2';
173+
$pane->pid = 'new-3';
150174
$pane->panel = 'center';
151175
$pane->type = 'views';
152176
$pane->subtype = 'os2web_cp_service_cp_document_view';
@@ -179,8 +203,8 @@ function os2web_cp_service_default_page_manager_handlers() {
179203
$pane->extras = array();
180204
$pane->position = 0;
181205
$pane->locks = array();
182-
$display->content['new-2'] = $pane;
183-
$display->panels['center'][0] = 'new-2';
206+
$display->content['new-3'] = $pane;
207+
$display->panels['center'][0] = 'new-3';
184208
$display->hide_title = PANELS_TITLE_FIXED;
185209
$display->title_pane = '0';
186210
$handler->conf['display'] = $display;

‎os2web_cp_service.views_default.inc

Lines changed: 54 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ function os2web_cp_service_views_default_views() {
2424
$handler = $view->new_display('default', 'Master', 'default');
2525
$handler->display->display_options['use_more_always'] = FALSE;
2626
$handler->display->display_options['use_more_text'] = 'mere';
27+
$handler->display->display_options['group_by'] = TRUE;
2728
$handler->display->display_options['access']['type'] = 'perm';
2829
$handler->display->display_options['cache']['type'] = 'none';
2930
$handler->display->display_options['query']['type'] = 'views_query';
31+
$handler->display->display_options['query']['options']['distinct'] = TRUE;
3032
$handler->display->display_options['exposed_form']['type'] = 'basic';
3133
$handler->display->display_options['exposed_form']['options']['submit_button'] = 'Filtrer';
3234
$handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Gendan';
@@ -115,10 +117,16 @@ function os2web_cp_service_views_default_views() {
115117
'empty_column' => 0,
116118
),
117119
);
118-
/* Opførsel ved ingen resultater: Global: Unfiltered text */
119-
$handler->display->display_options['empty']['area_text_custom']['id'] = 'area_text_custom';
120-
$handler->display->display_options['empty']['area_text_custom']['table'] = 'views';
121-
$handler->display->display_options['empty']['area_text_custom']['field'] = 'area_text_custom';
120+
/* Opførsel ved ingen resultater: Global: PHP */
121+
$handler->display->display_options['empty']['php']['id'] = 'php';
122+
$handler->display->display_options['empty']['php']['table'] = 'views';
123+
$handler->display->display_options['empty']['php']['field'] = 'php';
124+
$handler->display->display_options['empty']['php']['label'] = 'Ingen Resultater';
125+
$handler->display->display_options['empty']['php']['empty'] = TRUE;
126+
$handler->display->display_options['empty']['php']['php_output'] = '<?php if (count($view->exposed_input)) : ?>
127+
<span class="no-results">Vi finder desværre ikke nogen sager ud fra de valgte søgekriterier. Prøv at justere på dit søgeord eller tidsintervallet.</span>
128+
<?php endif; ?>
129+
';
122130
/* Forbindelse: Entity Reference: Refereret entity */
123131
$handler->display->display_options['relationships']['field_os2web_cp_service_doc_ref_target_id']['id'] = 'field_os2web_cp_service_doc_ref_target_id';
124132
$handler->display->display_options['relationships']['field_os2web_cp_service_doc_ref_target_id']['table'] = 'field_data_field_os2web_cp_service_doc_ref';
@@ -130,7 +138,14 @@ function os2web_cp_service_views_default_views() {
130138
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['label'] = '';
131139
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['exclude'] = TRUE;
132140
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['element_label_colon'] = FALSE;
133-
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['group_column'] = 'entity_id';
141+
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['group_columns'] = array(
142+
'bundle' => 'bundle',
143+
'language' => 'language',
144+
'entity_type' => 'entity_type',
145+
'entity_id' => 'entity_id',
146+
'value' => 'value',
147+
'format' => 'format',
148+
);
134149
/* Felt: Indhold: Indholdsbeskrivelse */
135150
$handler->display->display_options['fields']['field_os2web_cp_service_content']['id'] = 'field_os2web_cp_service_content';
136151
$handler->display->display_options['fields']['field_os2web_cp_service_content']['table'] = 'field_data_field_os2web_cp_service_content';
@@ -148,7 +163,7 @@ function os2web_cp_service_views_default_views() {
148163
$handler->display->display_options['fields']['title']['id'] = 'title';
149164
$handler->display->display_options['fields']['title']['table'] = 'node';
150165
$handler->display->display_options['fields']['title']['field'] = 'title';
151-
$handler->display->display_options['fields']['title']['label'] = 'Sags titel';
166+
$handler->display->display_options['fields']['title']['label'] = 'Sagstitel';
152167
$handler->display->display_options['fields']['title']['alter']['alter_text'] = TRUE;
153168
$handler->display->display_options['fields']['title']['alter']['text'] = '[title]';
154169
$handler->display->display_options['fields']['title']['alter']['make_link'] = TRUE;
@@ -215,6 +230,10 @@ function os2web_cp_service_views_default_views() {
215230
$handler->display->display_options['sorts']['created']['field'] = 'created';
216231
$handler->display->display_options['sorts']['created']['order'] = 'DESC';
217232
$handler->display->display_options['filter_groups']['operator'] = 'OR';
233+
$handler->display->display_options['filter_groups']['groups'] = array(
234+
1 => 'AND',
235+
2 => 'AND',
236+
);
218237
/* Filterkriterie: Indhold: Udgivet */
219238
$handler->display->display_options['filters']['status']['id'] = 'status';
220239
$handler->display->display_options['filters']['status']['table'] = 'node';
@@ -367,8 +386,9 @@ return TRUE; // If no exposed inputs, remove all results
367386
t('‹ Forrige'),
368387
t('Næste ›'),
369388
t('Sidste »'),
389+
t('Ingen Resultater'),
370390
t('Indhold entity refereret fra field_os2web_cp_service_doc_ref'),
371-
t('Sags titel'),
391+
t('Sagstitel'),
372392
t('[title]'),
373393
t('[field_os2web_cp_service_content]'),
374394
t('Dato'),
@@ -671,6 +691,13 @@ return TRUE; // If no exposed inputs, remove all results
671691
$handler->display->display_options['header']['area_text_custom']['content'] = '<h2>Sags Nr.: [field_os2web_cp_service_case_id]</h2>';
672692
$handler->display->display_options['header']['area_text_custom']['tokenize'] = TRUE;
673693
$handler->display->display_options['defaults']['fields'] = FALSE;
694+
/* Felt: Indhold: Sagstype - Sagstype */
695+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['id'] = 'field_os2web_cp_service_casetype';
696+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['table'] = 'field_data_field_os2web_cp_service_casetype';
697+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['field'] = 'field_os2web_cp_service_casetype';
698+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['label'] = '';
699+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['exclude'] = TRUE;
700+
$handler->display->display_options['fields']['field_os2web_cp_service_casetype']['element_label_colon'] = FALSE;
674701
/* Felt: Ren Addresse */
675702
$handler->display->display_options['fields']['field_os2web_cp_service_address']['id'] = 'field_os2web_cp_service_address';
676703
$handler->display->display_options['fields']['field_os2web_cp_service_address']['table'] = 'field_data_field_os2web_cp_service_address';
@@ -681,17 +708,24 @@ return TRUE; // If no exposed inputs, remove all results
681708
$handler->display->display_options['fields']['field_os2web_cp_service_address']['alter']['trim_whitespace'] = TRUE;
682709
$handler->display->display_options['fields']['field_os2web_cp_service_address']['element_label_colon'] = FALSE;
683710
$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%5Bvalue%5D%5Bdate%5D=&field_os2web_cp_service_date_to%5Bvalue%5D%5Bdate%5D=&case_id=';
694-
$handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE;
711+
/* Felt: Link til se alle på addresse */
712+
$handler->display->display_options['fields']['php']['id'] = 'php';
713+
$handler->display->display_options['fields']['php']['table'] = 'views';
714+
$handler->display->display_options['fields']['php']['field'] = 'php';
715+
$handler->display->display_options['fields']['php']['ui_name'] = 'Link til se alle på addresse';
716+
$handler->display->display_options['fields']['php']['label'] = '';
717+
$handler->display->display_options['fields']['php']['exclude'] = TRUE;
718+
$handler->display->display_options['fields']['php']['alter']['make_link'] = TRUE;
719+
$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';
720+
$handler->display->display_options['fields']['php']['element_label_colon'] = FALSE;
721+
$handler->display->display_options['fields']['php']['use_php_setup'] = 0;
722+
$handler->display->display_options['fields']['php']['php_output'] = '<?php
723+
$node = node_load($data->nid);
724+
if($node->field_os2web_cp_service_casetype[und][0][\'value\'] === \'EJSAG\') : ?>
725+
Se alle sager på denne addresse
726+
<?php endif; ?>';
727+
$handler->display->display_options['fields']['php']['use_php_click_sortable'] = '0';
728+
$handler->display->display_options['fields']['php']['php_click_sortable'] = '';
695729
/* Felt: Indhold: Nid */
696730
$handler->display->display_options['fields']['nid']['id'] = 'nid';
697731
$handler->display->display_options['fields']['nid']['table'] = 'node';
@@ -716,7 +750,7 @@ return TRUE; // If no exposed inputs, remove all results
716750
$handler->display->display_options['fields']['nothing_1']['table'] = 'views';
717751
$handler->display->display_options['fields']['nothing_1']['field'] = 'nothing';
718752
$handler->display->display_options['fields']['nothing_1']['label'] = 'Titel';
719-
$handler->display->display_options['fields']['nothing_1']['alter']['text'] = '[title] <br> [nothing]';
753+
$handler->display->display_options['fields']['nothing_1']['alter']['text'] = '[title] <br> [php]';
720754
$handler->display->display_options['fields']['nothing_1']['element_label_colon'] = FALSE;
721755
/* Felt: Indhold: SagsID */
722756
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['id'] = 'field_os2web_cp_service_case_id';
@@ -805,9 +839,8 @@ return TRUE; // If no exposed inputs, remove all results
805839
t('Dato'),
806840
t('Page'),
807841
t('<h2>Sags Nr.: [field_os2web_cp_service_case_id]</h2>'),
808-
t('Se alle sager på denne addresse'),
809842
t('[title] <br>[nothing]'),
810-
t('[title] <br> [nothing]'),
843+
t('[title] <br> [php]'),
811844
);
812845
$export['os2web_cp_service_cp_case_view'] = $view;
813846

0 commit comments

Comments
 (0)