Merge branch 'dev'

.idea/workspace.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1ddb4e50-491a-44ba-87fc-5ef40f04cd18" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Exports/Sheets/RecordsPerProjectSheet.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Exports/Sheets/RecordsPerProjectSheet.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

app/Exports/Sheets/RecordsPerProjectSheet.php

@@ -45,7 +45,7 @@ class RecordsPerProjectSheet implements
             optional($record->purpose)->purpose,
             $record->processingCategories->implode('category', ', '),
             $record->note,
-            $record->dataCategory->category,
+            optional($record->dataCategory)->category,
             optional($record->dataSubjectCategory)->category,
             optional($record->lawfulBasis)->lawful_basis,
             $record->ethics_approval ? 'TRUE' : 'FALSE',