From 65181bed14ac36a452b7f4cd4e4f8be81b056a02 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 15 Sep 2022 08:54:14 +0200
Subject: [PATCH 1/3] changed import settings save

---
 rowers/views/userviews.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index 4560f1d4..a325cc06 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -377,7 +377,7 @@ def rower_exportsettings_view(request, userid=0):
         'nk_auto_import': 'nktoken'
     }
     r = getrequestrowercoachee(request, userid=userid)
-    
+
     if request.method == 'POST':
         form = RowerExportForm(request.POST)
         if form.is_valid():
@@ -392,8 +392,11 @@ def rower_exportsettings_view(request, userid=0):
                 doset = True
                 try:
                     tokenname = attrtokens[attr]
-                    if getattr(r, tokenname) == '' or getattr(r, tokenname) is None:
-                        doset = False
+                    print(attr, value)
+                    if (getattr(r, tokenname) == '' or getattr(r, tokenname) is None) and value:
+                        messages.error(
+                            request, 'Set '+attr+' but it will not be effective until you create a connection.'
+                        )
                 except KeyError:
                     doset = True
                 if not user_is_not_basic(r.user):  # pragma: no cover

From 1a8b1502993ee9e886019d6f294e5fadc9d1ef8c Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 15 Sep 2022 09:00:36 +0200
Subject: [PATCH 2/3] fixed alert bug

---
 rowers/templates/alerts.html  | 1 +
 rowers/views/analysisviews.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rowers/templates/alerts.html b/rowers/templates/alerts.html
index 9045766f..981761d1 100644
--- a/rowers/templates/alerts.html
+++ b/rowers/templates/alerts.html
@@ -95,6 +95,7 @@
   var percentage = json['stats']['percentage'];
   var startdate = json['stats']['startdate'];
   var enddate = json['stats']['enddate'];
+  console.log(percentage, startdate, enddate)
   thediv.siblings("#percentages").find("#percentage").text(percentage);
   thediv.siblings("#dates").find("#startdate").text(startdate);
   thediv.siblings("#dates").find("#enddate").text(enddate);
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 46b4b682..fdc55c57 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -1958,7 +1958,7 @@ def alert_report_view(request, id=0, userid=0, nperiod=0):
     stats = alert_get_stats(alert, nperiod=nperiod)
 
     is_ajax = request_is_ajax(request)
-    if not is_ajax:
+    if is_ajax:
         return JSONResponse({
             "stats": stats,
         })

From 065175a20bfea08cc23d805f112abab9f36e7e27 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 15 Sep 2022 09:44:50 +0200
Subject: [PATCH 3/3] remove print

---
 rowers/views/userviews.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index a325cc06..2a9601f9 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -392,7 +392,6 @@ def rower_exportsettings_view(request, userid=0):
                 doset = True
                 try:
                     tokenname = attrtokens[attr]
-                    print(attr, value)
                     if (getattr(r, tokenname) == '' or getattr(r, tokenname) is None) and value:
                         messages.error(
                             request, 'Set '+attr+' but it will not be effective until you create a connection.'