From 7bac6ca6d0fc64aa15ac7a35a417d000cac7d5e9 Mon Sep 17 00:00:00 2001 From: XaelShan Date: Fri, 30 Jun 2023 09:59:54 -0400 Subject: [PATCH] figuring out opt_in function --- webfit/analyze/fitting/models.py | 2 -- webfit/analyze/models.py | 6 +++--- webfit/data/models.py | 3 +-- webfit/data/urls.py | 3 ++- webfit/data/views.py | 13 +++++++++---- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/webfit/analyze/fitting/models.py b/webfit/analyze/fitting/models.py index f3b78fa4b8..e7a2036b79 100644 --- a/webfit/analyze/fitting/models.py +++ b/webfit/analyze/fitting/models.py @@ -39,8 +39,6 @@ class Fit(AnalysisBase): import_example_data = [ ] - fit_success = models.BooleanField(default = False, help_text= "Successful completion status of fit") - class FitParameter(AnalysisParameterBase): Units = [ diff --git a/webfit/analyze/models.py b/webfit/analyze/models.py index 46ce7b446b..d41715917c 100644 --- a/webfit/analyze/models.py +++ b/webfit/analyze/models.py @@ -33,7 +33,7 @@ models_logger = getLogger(__name__) class AnalysisBase(models.Model): - id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) + id = models.BigAutoField(primary_key=True) user_id = Data.user_id GPU_enabled = models.BooleanField(default = False, help_text= "use GPU rather than CPU") @@ -54,7 +54,7 @@ class AnalysisBase(models.Model): is_public = models.BooleanField(default = False, help_text="does the user want their data to be public") class AnalysisParameterBase(models.Model): - id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) + id = models.BigAutoField(primary_key=True) name = models.CharField(max_length=100, help_text="Parameter Name") """datatype = models.FloatField() @@ -69,7 +69,7 @@ class AnalysisParameterBase(models.Model): class AnalysisModelBase(models.Model): - id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) + id = models.BigAutoField(primary_key=True) name = models.CharField(max_length=300, help_text="name of analysis model") #list of analysis parameters parameters = [ diff --git a/webfit/data/models.py b/webfit/data/models.py index fb87aff6c1..d3e84acf33 100644 --- a/webfit/data/models.py +++ b/webfit/data/models.py @@ -32,9 +32,8 @@ # do we want individual dbs for each perspective? - class Data(models.Model): - id = models.UUIDField(primary_key=True, default = uuid.uuid4, editable=False) + id = models.BigAutoField(primary_key=True) #user id user_id = models.ForeignKey(User, default=None, on_delete=models.CASCADE) diff --git a/webfit/data/urls.py b/webfit/data/urls.py index 71025fb1dd..c8ff7d679f 100644 --- a/webfit/data/urls.py +++ b/webfit/data/urls.py @@ -5,6 +5,7 @@ logger = logging.getLogger(__name__) urlpatterns = [ - path("import//", views.import_file_string, name = "import data"), + re_path(r"import/(?P)/$", views.import_file_string, name = "import data"), + re_path(r"import/(?P)/(?P)/$", views.import_file_string, name = "import data and opt in"), path("export/", views.export_data, name = "export/save data") ] \ No newline at end of file diff --git a/webfit/data/views.py b/webfit/data/views.py index 19102dc42d..6159497b03 100644 --- a/webfit/data/views.py +++ b/webfit/data/views.py @@ -13,7 +13,7 @@ @api_view(['POST', 'PUT']) -def import_file_string(request, file_id, version): +def import_file_string(request, file_id, version, optional_parameter='opt_in'): #saves file_string if request.method == 'POST': @@ -65,6 +65,11 @@ def export_data(request, save_file_id, version = None): serializer.save() return Response(serializer.data) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - -def export_to_example_data(): - \ No newline at end of file + + + +#do we want to automatically do this? no request +#add this as a function that can be called by export_data? +#how do we do this +def export_to_example_data(data): + #code here to download back to sasview... \ No newline at end of file