Skip to content

Beautiful Open-Source Form Builder

Choose Visible columns & in csv with removed field (#11)

Chirag8f528155f5db
diff --git a/app/Http/Controllers/Forms/FormSubmissionController.php b/app/Http/Controllers/Forms/FormSubmissionController.php
index 5c96bc9b8..ba7a8f8ed 100644
--- a/app/Http/Controllers/Forms/FormSubmissionController.php
+++ b/app/Http/Controllers/Forms/FormSubmissionController.php
@@ -35,7 +35,8 @@ class FormSubmissionController extends Controller
foreach ($form->submissions->toArray() as $row) {
$formatter = (new FormSubmissionFormatter($form, $row['data']))
->outputStringsOnly()
- ->setEmptyForNoValue();
+ ->setEmptyForNoValue()
+ ->showRemovedFields();
$tmp = $formatter->getCleanKeyValue();
$tmp['Create Date'] = date("Y-m-d H:i", strtotime($row['created_at']));
$allRows[] = $tmp;
diff --git a/app/Http/Resources/FormResource.php b/app/Http/Resources/FormResource.php
index dbb850e07..bad73e670 100644
--- a/app/Http/Resources/FormResource.php
+++ b/app/Http/Resources/FormResource.php
@@ -45,6 +45,7 @@ class FormResource extends JsonResource
'visibility' => $this->visibility,
'notification_emails' => $this->notification_emails,
'slack_webhook_url' => $this->slack_webhook_url,
+ 'removed_properties' => $this->removed_properties
] : [];
$baseData = $this->getFilteredFormData(parent::toArray($request), $this->userIsFormOwner());
diff --git a/app/Service/Forms/FormSubmissionFormatter.php b/app/Service/Forms/FormSubmissionFormatter.php
index 8ac7c5ac0..e4416d415 100644
--- a/app/Service/Forms/FormSubmissionFormatter.php
+++ b/app/Service/Forms/FormSubmissionFormatter.php
@@ -27,6 +27,8 @@ class FormSubmissionFormatter
private $setEmptyForNoValue = false;
+ private $showRemovedFields = false;
+
public function __construct(private Form $form, private array $formData)
{
}
@@ -55,6 +57,12 @@ class FormSubmissionFormatter
return $this;
}
+ public function showRemovedFields()
+ {
+ $this->showRemovedFields = true;
+ return $this;
+ }
+
/**
* Return a nice "FieldName": "Field Response" array
* - If createLink enabled, returns html link for emails and links
@@ -63,10 +71,15 @@ class FormSubmissionFormatter
public function getCleanKeyValue()
{
$data = $this->formData;
- $fields = $this->form->properties;
+ $fields = ($this->showRemovedFields) ? array_merge($this->form->properties, $this->form->removed_properties) : $this->form->properties;
$returnArray = [];
foreach ($fields as &$field) {
+ $isRemoved = in_array($field['id'], array_column($this->form->removed_properties, 'id')) ?? false;
+ if($isRemoved){
+ $field['name'] = $field['name']." (deleted)";
+ }
+
// If not present skip
if (!isset($data[$field['id']])) {
if ($this->setEmptyForNoValue) {
diff --git a/resources/js/components/forms/components/VSwitch.vue b/resources/js/components/forms/components/VSwitch.vue
index 24da137e3..2be7471b7 100644
--- a/resources/js/components/forms/components/VSwitch.vue
+++ b/resources/js/components/forms/components/VSwitch.vue
@@ -1,42 +1,15 @@
<template>
- <div>
- <Motion
- v-model="value"
- :options="{
- duration: 150,
- }"
- :trigger="[
- 'bg-gray-200 border-gray-300 duration-100 dark:bg-gray-700 dark:border-gray-600',
- 'bg-gray-200 dark:bg-gray-700',
- 'bg-nt-blue border-nt-blue',
- 'bg-nt-blue duration-100',
- ]"
- class="inline-flex items-center h-6 w-12 p-1 border rounded-full cursor-pointer focus:outline-none"
- @click="$emit('input',!internalValue)"
- >
- <Motion
- v-model="internalValue"
- tag="span"
- :options="{
- duration: 150,
- }"
- :trigger="[
- 'translate-x-0 duration-150',
- 'rounded-2xl scale-75 duration-100',
- 'translate-x-6 duration-100',
- 'scale-100 duration-150',
- ]"
- class="inline-block h-4 w-4 rounded-full bg-white dark:bg-gray-500 shadow"
- />
- </Motion>
+ <div @click="onClick">
+ <div class="inline-flex items-center h-6 w-12 p-1 bg-gray-300 border rounded-full cursor-pointer focus:outline-none transition-all transform ease-in-out duration-100" :class="{'bg-nt-blue': internalValue}">
+ <div class="inline-block h-4 w-4 rounded-full bg-white shadow transition-all transform ease-in-out duration-150 rounded-2xl scale-100" :class="{'translate-x-5.5': internalValue}" />
+ </div>
</div>
</template>
<script>
-import Motion from 'tinymotion'
export default {
name: 'VSwitch',
- components: { Motion },
+ components: { },
props: {
value: { type: Boolean, default: false }
@@ -48,14 +21,7 @@ export default {
}
},
- computed: {
- sizeClasses () {
- if (this.size === 'small') {
- return 'w-3 h-3'
- }
- return 'w-5 h-5'
- }
- },
+ computed: {},
watch: {
value (val) {
@@ -68,12 +34,10 @@ export default {
},
methods: {
+ onClick () {
+ this.$emit('input', !this.internalValue)
+ this.internalValue = !this.internalValue
+ }
}
}
-</script>
-
-<style scoped>
-.translate-x-6 {
- --tw-translate-x: 1.4rem !important;
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/resources/js/components/open/forms/components/FormSubmissions.vue b/resources/js/components/open/forms/components/FormSubmissions.vue
index 5bb97efa4..1d6bff0da 100644
--- a/resources/js/components/open/forms/components/FormSubmissions.vue
+++ b/resources/js/components/open/forms/components/FormSubmissions.vue
@@ -2,11 +2,41 @@
<div
class="my-4 w-full mx-auto">
<h3 class="font-semibold mb-4">
- Form Submissions <span v-if="form && !isLoading && tableData.length > 0"
- class="text-right text-xs uppercase mb-2">
- - <a :href="exportUrl" target="_blank">Export as CSV</a>
- </span>
+ Form Submissions
+ <span v-if="form && !isLoading && tableData.length > 0" class="text-right text-xs uppercase mb-2"> - <a :href="exportUrl" target="_blank">Export as CSV</a></span>
+ <span v-if="form && !isLoading && formInitDone" class="float-right text-xs uppercase mb-2"> <a href="javascript:void(0);" @click="showColumnsModal=true">Display columns</a></span>
</h3>
+
+ <!-- Table columns modal -->
+ <modal :show="showColumnsModal" @close="showColumnsModal=false">
+ <div class="-m-6">
+ <div class="px-6 py-3">
+ <h2 class="text-nt-blue text-3xl font-bold">
+ Display columns
+ </h2>
+ </div>
+ <div class="border-t py-4 px-6">
+ <template v-if="properties.length > 0">
+ <h4 class="font-bold mb-2">Form Fields</h4>
+ <div v-for="field in properties" :key="field.id" class="p-2 border">
+ {{ field.name }}
+ <v-switch v-model="displayColumns[field.id]" @input="onChangeDisplayColumns" class="float-right" />
+ </div>
+ </template>
+ <template v-if="removed_properties.length > 0">
+ <h4 class="font-bold mb-2 mt-4">Removed Fields</h4>
+ <div v-for="field in removed_properties" :key="field.id" class="p-2 border">
+ {{ field.name }}
+ <v-switch v-model="displayColumns[field.id]" @input="onChangeDisplayColumns" class="float-right" />
+ </div>
+ </template>
+ </div>
+ <div class="flex justify-end mt-4 pb-5 px-6">
+ <v-button color="gray" shade="light" @click="showColumnsModal=false">Close</v-button>
+ </div>
+ </div>
+ </modal>
+
<loader v-if="!form || isLoading" class="h-6 w-6 text-nt-blue mx-auto"/>
<div v-else>
<scroll-shadow
@@ -33,10 +63,11 @@ import axios from 'axios'
import ScrollShadow from '../../../common/ScrollShadow'
import OpenTable from '../../tables/OpenTable'
import clonedeep from "clone-deep";
+import VSwitch from '../../../forms/components/VSwitch'
export default {
name: 'FormSubmissions',
- components: {ScrollShadow, OpenTable},
+ components: {ScrollShadow, OpenTable, VSwitch},
props: {},
data() {
return {
@@ -45,6 +76,10 @@ export default {
tableData: [],
currentPage: 1,
fullyLoaded: false,
+ showColumnsModal: false,
+ properties: [],
+ removed_properties: [],
+ displayColumns: {},
}
},
mounted() {
@@ -69,18 +104,6 @@ export default {
this.$store.commit('open/working_form/set', value)
}
},
- tableStructure() {
- if (!this.form) {
- return []
- }
- let tmp = this.form.properties.filter(property => !property.hasOwnProperty('hidden') || !property.hidden)
- tmp.push({
- "name": "Create Date",
- "id": "create_date",
- "type": "date"
- });
- return tmp
- },
exportUrl() {
if (!this.form) {
return ''
@@ -104,6 +127,20 @@ export default {
})
this.$set(this.form, 'properties', columns)
this.formInitDone = true
+
+ this.properties = clonedeep(this.form.properties)
+ this.removed_properties = clonedeep(this.form.removed_properties)
+
+ // Get display columns from local storage
+ const tmpColumns = window.localStorage.getItem('display-columns-formid-'+this.form.id)
+ if(tmpColumns !== null && tmpColumns){
+ this.displayColumns = JSON.parse(tmpColumns)
+ this.onChangeDisplayColumns()
+ }else{
+ this.form.properties.forEach((field) => {
+ this.displayColumns[field.id] = true
+ })
+ }
},
getSubmissionsData() {
if (!this.form || this.fullyLoaded) {
@@ -131,6 +168,13 @@ export default {
this.$refs.shadows.toggleShadow()
this.$refs.shadows.calcDimensions()
},
+ onChangeDisplayColumns(){
+ window.localStorage.setItem('display-columns-formid-'+this.form.id, JSON.stringify(this.displayColumns))
+ const final_properties = this.properties.concat(this.removed_properties).filter((field) => {
+ return this.displayColumns[field.id] === true
+ })
+ this.$set(this.form, 'properties', final_properties)
+ }
},
}
</script>
diff --git a/tailwind.config.js b/tailwind.config.js
index a36bd7649..e1a00fdd6 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -40,6 +40,9 @@ module.exports = {
10: '10rem',
8: '2rem'
},
+ translate: {
+ 5.5: '1.4rem'
+ },
boxShadow: {
'inner-notion': '#0f0f0f1a 0px 0px 0px 1px inset',
'focus-notion': '#2eaadcb3 0px 0px 0px 1px inset, #2eaadc66 0px 0px 0px 2px !important'