Merge branch 'master' into trav

Added amount field to case fee, total fee to case, and code to calculate the total

css/opencase.css

@@ -7,8 +7,21 @@
 #block-accreditationcount {
   position: absolute;
   right: 50%;
+  /*background-color: #fff;*/
+  background-image: linear-gradient(to top, #2a419a 0%, #1d84c3 100%);
+  border-radius: 5px;
 }
 
+#block-accreditationcount table {
+  border: 0px #2a419a;
+  background-color: #1d84c3;
+}
+
+#block-accreditationcount h1 {
+  color: white;
+}
+
+
 #block-accreditationcount td {
   color: black;
 }
@@ -133,3 +146,50 @@ table.views-table.views-view-table caption {
 form.oc-organisation-relation-form tr:first-child {
   display: none;
 }
+
+
+/* trav styling */
+.site-branding {
+	margin-top: -2.20em !important;
+}
+
+.follow-up-due {
+	
+}
+
+tr:nth-child(even) {
+  background-color: #fefefe;
+}
+
+tr:nth-child(odd) {
+  background-color: #eee;
+}
+
+.Off {
+	color:gray;
+}
+
+.Off a {
+	color:gray;
+	background-color:black;
+}
+
+.field--type-entity-reference-revisions {
+	border-radius: 25px;
+	border: 2px solid #2A419A;
+	padding: 10px; 
+	border-width: thin;
+}
+
+.follow-ups-due table{
+	background-color: #FB8A4F;
+}
+
+.views-field-field-client-substatus {
+	font-weight: bold;
+}	
+
+thead {
+	background-color: #1d84c3;
+}	
+

modules/opencase_cases/src/Entity/OCCase.php

@@ -234,7 +234,7 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface {
       ->setLabel(t('Title'))
       ->setRevisionable(TRUE)
       ->setSettings([
-        'max_length' => 50,
+        'max_length' => 120,
         'text_processing' => 0,
       ])
       ->setDefaultValue('')

modules/opencase_cases/src/Entity/OCCaseFee.php

@@ -56,17 +56,17 @@ use Drupal\user\UserInterface;
  *     "published" = "status",
  *   },
  *   links = {
- *     "canonical" = "/admin/opencase/oc_case_fee/{oc_case_fee}",
- *     "add-page" = "/admin/opencase/oc_case_fee/add",
- *     "add-form" = "/admin/opencase/oc_case_fee/add/{oc_case_fee_type}",
- *     "edit-form" = "/admin/opencase/oc_case_fee/{oc_case_fee}/edit",
- *     "delete-form" = "/admin/opencase/oc_case_fee/{oc_case_fee}/delete",
- *     "version-history" = "/admin/opencase/oc_case_fee/{oc_case_fee}/revisions",
- *     "revision" = "/admin/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/view",
- *     "revision_revert" = "/admin/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/revert",
- *     "revision_delete" = "/admin/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/delete",
- *     "translation_revert" = "/admin/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/revert/{langcode}",
- *     "collection" = "/admin/opencase/oc_case_fee",
+ *     "canonical" = "/opencase/oc_case_fee/{oc_case_fee}",
+ *     "add-page" = "/opencase/oc_case_fee/add",
+ *     "add-form" = "/opencase/oc_case_fee/add/{oc_case_fee_type}",
+ *     "edit-form" = "/opencase/oc_case_fee/{oc_case_fee}/edit",
+ *     "delete-form" = "/opencase/oc_case_fee/{oc_case_fee}/delete",
+ *     "version-history" = "/opencase/oc_case_fee/{oc_case_fee}/revisions",
+ *     "revision" = "/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/view",
+ *     "revision_revert" = "/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/revert",
+ *     "revision_delete" = "/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/delete",
+ *     "translation_revert" = "/opencase/oc_case_fee/{oc_case_fee}/revisions/{oc_case_fee_revision}/revert/{langcode}",
+ *     "collection" = "/opencase/oc_case_fee",
  *   },
  *   bundle_entity_type = "oc_case_fee_type",
  *   field_ui_base_route = "entity.oc_case_fee_type.edit_form"
@@ -290,6 +290,7 @@ class OCCaseFee extends EditorialContentEntityBase implements OCCaseFeeInterface
       ->setSettings([
         'prefix' => '£',
       ])
+      ->setRequired(TRUE)
       ->SetDisplayConfigurable("form", true)
       ->SetDisplayConfigurable("view", true);
 

modules/opencase_cases/src/Entity/OCCaseProvision.php

@@ -56,17 +56,17 @@ use Drupal\user\UserInterface;
  *     "published" = "status",
  *   },
  *   links = {
- *     "canonical" = "/admin/opencase/oc_case_provision/{oc_case_provision}",
- *     "add-page" = "/admin/opencase/oc_case_provision/add",
- *     "add-form" = "/admin/opencase/oc_case_provision/add/{oc_case_provision_type}",
- *     "edit-form" = "/admin/opencase/oc_case_provision/{oc_case_provision}/edit",
- *     "delete-form" = "/admin/opencase/oc_case_provision/{oc_case_provision}/delete",
- *     "version-history" = "/admin/opencase/oc_case_provision/{oc_case_provision}/revisions",
- *     "revision" = "/admin/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/view",
- *     "revision_revert" = "/admin/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/revert",
- *     "revision_delete" = "/admin/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/delete",
- *     "translation_revert" = "/admin/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/revert/{langcode}",
- *     "collection" = "/admin/opencase/oc_case_provision",
+ *     "canonical" = "/opencase/oc_case_provision/{oc_case_provision}",
+ *     "add-page" = "/opencase/oc_case_provision/add",
+ *     "add-form" = "/opencase/oc_case_provision/add/{oc_case_provision_type}",
+ *     "edit-form" = "/opencase/oc_case_provision/{oc_case_provision}/edit",
+ *     "delete-form" = "/opencase/oc_case_provision/{oc_case_provision}/delete",
+ *     "version-history" = "/opencase/oc_case_provision/{oc_case_provision}/revisions",
+ *     "revision" = "/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/view",
+ *     "revision_revert" = "/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/revert",
+ *     "revision_delete" = "/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/delete",
+ *     "translation_revert" = "/opencase/oc_case_provision/{oc_case_provision}/revisions/{oc_case_provision_revision}/revert/{langcode}",
+ *     "collection" = "/opencase/oc_case_provision",
  *   },
  *   bundle_entity_type = "oc_case_provision_type",
  *   field_ui_base_route = "entity.oc_case_provision_type.edit_form"
@@ -277,9 +277,16 @@ class OCCaseProvision extends EditorialContentEntityBase implements OCCaseProvis
     $fields['oc_provider'] = \Drupal\Core\Field\BaseFieldDefinition::create('entity_reference')
       ->setLabel(t('Provider'))
       ->setSetting('target_type', 'oc_actor') // TODO: this should eventually point to a Provider rather than an Actor
-      ->setSetting('handler', 'default')
+      ->setSetting('handler', 'views')
       ->setTranslatable(TRUE)
       ->setCardinality(1)
+      ->setSetting('handler_settings', [
+        'view' => [
+          'view_name' => 'case_providers',
+          'display_name' => 'entity_reference_1',
+          'arguments' => [],
+        ]
+      ])
       ->setDisplayConfigurable("view", true)
       ->setDisplayConfigurable("form", true)
       ->setRequired(TRUE);

modules/opencase_entities/src/Entity/OCActivity.php

@@ -225,25 +225,14 @@ class OCActivity extends RevisionableContentEntityBase implements OCActivityInte
     $fields['activity_date_time'] = BaseFieldDefinition::create('datetime')
       ->setLabel(t('Date and time'))
       ->setRevisionable(TRUE)
-      ->setRequired(TRUE)
       ->setDefaultValueCallback('\Drupal\opencase_entities\Entity\OCActivity::currentDateTime')
       ->setDisplayConfigurable('form', true)
       ->setDisplayConfigurable('view', true)
       ->setSettings([
           'datetime_type' => 'date'
-        ])
-      ->setDisplayOptions('view', [
-        'label' => 'above',
-        'type' => 'datetime_default',
-        'settings' => [
-          'format_type' => 'short',
-        ],
-        'weight' => -3,
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'datetime_default',
-        'weight' => -3,
-      ]);
+       ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDisplayConfigurable('view', TRUE);
 
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Publishing status'))

opencase.info.yml

@@ -2,7 +2,7 @@ name: 'OpenCase'
 type: module
 description: 'Simple Case Management'
 core: 8.x
-version: 8.x-2.7
+version: 8.x-3.0
 package: 'OpenCase'
 dependencies:
   - opencase_entities

opencase.links.menu.yml

@@ -70,3 +70,8 @@ opencase.manage_event_types:
   parent: opencase.opencase_admin_menu 
   url: internal:/admin/opencase/oc_event_type
   weight: 1
+opencase.reporting:
+  title: 'Reporting'
+  menu_name: opencase 
+  route_name: opencase.opencase_reporting_menu
+  weight: 0

opencase.routing.yml

@@ -10,3 +10,7 @@ opencase.opencase_add_new_things_menu:
   path: '/'
   requirements:
     _permission: 'use opencase'
+opencase.opencase_reporting_menu:
+  path: '/'
+  requirements:
+    _permission: 'use opencase'