Merge pull request #617 from statonlab/616-report-observation-notific…

…ations-not-working notify_user now gets a value of 1 in the db
statonlab · Apr 2, 2024 · dd68612 · dd68612
2 parents b7714d5 + 57d24dc
commit dd68612
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/app/Console/Commands/SendFilterNotifications.php b/app/Console/Commands/SendFilterNotifications.php
@@ -15,7 +15,7 @@ class SendFilterNotifications extends Command
      *
      * @var string
      */
-    protected $signature = 'notify:filters {-p|--print=0}';
+    protected $signature = 'notify:filters {--print}';
 
     /**
      * The console command description.

diff --git a/app/Http/Controllers/FiltersController.php b/app/Http/Controllers/FiltersController.php
@@ -146,7 +146,7 @@ public function create(Request $request, $with_observations = false)
                 'user_id' => $user->id,
                 'name' => $request->name,
                 'rules' => $request->all(),
-                'notify_user' => false,
+                'notify_user' => $request->notify_user,
             ]);
         }
 

diff --git a/resources/assets/js/components/AdvancedFiltersModal.jsx b/resources/assets/js/components/AdvancedFiltersModal.jsx
@@ -50,6 +50,7 @@ export default class AdvancedFiltersModal extends Component {
       endDate           : null,
       groups            : [],
       selectedGroup     : -1,
+      notify_user       : true,
     }
   }
 
@@ -128,6 +129,7 @@ export default class AdvancedFiltersModal extends Component {
         start: this.state.startDate ? this.state.startDate.format('YYYY-MM-DD') : null,
         end  : this.state.endDate ? this.state.endDate.format('YYYY-MM-DD') : null,
       },
+      notify_user     : this.state.notify_user,
     }
 
     if (this.props.applyFilters) {
@@ -168,6 +170,10 @@ export default class AdvancedFiltersModal extends Component {
 
       this.setState({loading: false})
     })
+
+    if(this.state.notify_user == true){
+      console.log('triggered')
+    }
   }
 
   count(changed) {
@@ -204,6 +210,7 @@ export default class AdvancedFiltersModal extends Component {
         start: this.state.startDate ? this.state.startDate.format('YYYY-MM-DD') : null,
         end  : this.state.endDate ? this.state.endDate.format('YYYY-MM-DD') : null,
       },
+      notify_user     : filters.notify_user
     }).then(response => {
       this.setState({
         loading     : false,
@@ -538,7 +545,7 @@ export default class AdvancedFiltersModal extends Component {
             <div className="field">
               <div className="control">
                 <label className="label checkbox">
-                  <input type="checkbox" className="mr-0" defaultChecked={false}/>
+                  <input type="checkbox" className="mr-0" defaultChecked={this.state.notify_user}/>
                   Notify me via email if new observations fitting this criteria get submitted
                 </label>
                 <p className="help mr-1">Maximum of 3 emails per week.</p>