Better Progress Tracking

Author: alex

.gitignore

@@ -1,11 +1,11 @@
+*.pyc
+.idea
+/staticfiles
 data.json
-static/
-scap/static/
-scap/__pycache__/
-SCAPTestProject/__pycache__/
-scap/migrations/
-media/
+/scap/migrations
+/static
+/media
+/scapadmin/migrations
+/scap/static/assets
 logfile
-/scap/migrations/
-dump.rdb
-.idea/
+db.sqlite3

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,122 @@
+name: SCAP_WebApp
+channels:
+  - defaults
+dependencies:
+  - asgiref=3.5.2=py39haa95532_0
+  - blas=1.0=mkl
+  - bottleneck=1.3.5=py39h080aedc_0
+  - brotli=1.0.9=h2bbff1b_7
+  - brotli-bin=1.0.9=h2bbff1b_7
+  - ca-certificates=2023.05.30=haa95532_0
+  - contourpy=1.0.5=py39h59b6b97_0
+  - cycler=0.11.0=pyhd3eb1b0_0
+  - django=4.1=py39haa95532_0
+  - fonttools=4.25.0=pyhd3eb1b0_0
+  - freetype=2.12.1=ha860e81_0
+  - giflib=5.2.1=h8cc25b3_3
+  - glib=2.69.1=h5dc1a3c_2
+  - gst-plugins-base=1.18.5=h9e645db_0
+  - gstreamer=1.18.5=hd78058f_0
+  - icu=58.2=ha925a31_3
+  - importlib_resources=5.2.0=pyhd3eb1b0_1
+  - intel-openmp=2023.1.0=h59b6b97_46319
+  - jpeg=9e=h2bbff1b_1
+  - kiwisolver=1.4.4=py39hd77b12b_0
+  - krb5=1.19.4=h5b6d351_0
+  - lerc=3.0=hd77b12b_0
+  - libbrotlicommon=1.0.9=h2bbff1b_7
+  - libbrotlidec=1.0.9=h2bbff1b_7
+  - libbrotlienc=1.0.9=h2bbff1b_7
+  - libclang=14.0.6=default_hb5a9fac_1
+  - libclang13=14.0.6=default_h8e68704_1
+  - libdeflate=1.17=h2bbff1b_0
+  - libffi=3.4.4=hd77b12b_0
+  - libiconv=1.16=h2bbff1b_2
+  - libogg=1.3.5=h2bbff1b_1
+  - libpng=1.6.39=h8cc25b3_0
+  - libtiff=4.5.0=h6c2663c_2
+  - libvorbis=1.3.7=he774522_0
+  - libwebp=1.2.4=hbc33d0d_1
+  - libwebp-base=1.2.4=h2bbff1b_1
+  - libxml2=2.10.3=h0ad7f3c_0
+  - libxslt=1.1.37=h2bbff1b_0
+  - lz4-c=1.9.4=h2bbff1b_0
+  - matplotlib=3.7.1=py39haa95532_1
+  - matplotlib-base=3.7.1=py39hf11a4ad_1
+  - mkl=2023.1.0=h8bd8f75_46356
+  - mkl-service=2.4.0=py39h2bbff1b_1
+  - mkl_fft=1.3.6=py39hf11a4ad_1
+  - mkl_random=1.2.2=py39hf11a4ad_1
+  - munkres=1.1.4=py_0
+  - numexpr=2.8.4=py39h7b80656_1
+  - numpy=1.24.3=py39h79a8e48_1
+  - numpy-base=1.24.3=py39h8a87ada_1
+  - openssl=1.1.1u=h2bbff1b_0
+  - packaging=23.0=py39haa95532_0
+  - pandas=1.5.3=py39hf11a4ad_0
+  - pcre=8.45=hd77b12b_0
+  - pillow=9.4.0=py39hd77b12b_0
+  - pip=23.0.1=py39haa95532_0
+  - ply=3.11=py39haa95532_0
+  - pyparsing=3.0.9=py39haa95532_0
+  - pyqt=5.15.7=py39hd77b12b_0
+  - pyqt5-sip=12.11.0=py39hd77b12b_0
+  - python=3.9.16=h6244533_2
+  - python-dateutil=2.8.2=pyhd3eb1b0_0
+  - python-tzdata=2021.1=pyhd3eb1b0_0
+  - pytz=2022.7=py39haa95532_0
+  - qt-main=5.15.2=he8e5bd7_8
+  - qt-webengine=5.15.9=hb9a9bb5_5
+  - qtwebkit=5.212=h2bbfb41_5
+  - setuptools=67.8.0=py39haa95532_0
+  - sip=6.6.2=py39hd77b12b_0
+  - six=1.16.0=pyhd3eb1b0_1
+  - sqlite=3.41.2=h2bbff1b_0
+  - sqlparse=0.4.3=py39haa95532_0
+  - tbb=2021.8.0=h59b6b97_0
+  - tk=8.6.12=h2bbff1b_0
+  - toml=0.10.2=pyhd3eb1b0_0
+  - tornado=6.2=py39h2bbff1b_0
+  - tzdata=2023c=h04d1e81_0
+  - vc=14.2=h21ff451_1
+  - vs2015_runtime=14.27.29016=h5e58377_2
+  - wheel=0.38.4=py39haa95532_0
+  - xz=5.4.2=h8cc25b3_0
+  - zipp=3.11.0=py39haa95532_0
+  - zlib=1.2.13=h8cc25b3_0
+  - zstd=1.5.5=hd43e919_0
+  - pip:
+    - asttokens==2.2.1
+    - backcall==0.2.0
+    - colorama==0.4.6
+    - coverage==7.2.7
+    - decorator==5.1.1
+    - defusedxml==0.7.1
+    - diff-match-patch==20230430
+    - django-colorfield==0.9.0
+    - django-import-export==3.2.0
+    - et-xmlfile==1.1.0
+    - executing==1.2.0
+    - ipython==8.14.0
+    - jedi==0.18.2
+    - markuppy==1.14
+    - matplotlib-inline==0.1.6
+    - nested-lookup==0.2.25
+    - odfpy==1.4.1
+    - openpyxl==3.1.2
+    - pandas-highcharts==0.5.2
+    - parso==0.8.3
+    - pickleshare==0.7.5
+    - prompt-toolkit==3.0.38
+    - pure-eval==0.2.2
+    - pygments==2.15.1
+    - pyyaml==6.0
+    - stack-data==0.6.2
+    - tablib==3.4.0
+    - traitlets==5.9.0
+    - typing-extensions==4.6.3
+    - uuid==1.30
+    - wcwidth==0.2.6
+    - xlrd==2.0.1
+    - xlwt==1.3.0
+prefix: C:\ProgramData\Anaconda3\envs\SCAP_WebApp

.idea/misc.xml

@@ -1,38 +1,37 @@
-affine==2.4.0
-attrs==23.1.0
-boto3==1.28.54
-botocore==1.31.54
-certifi==2023.7.22
-click==8.1.7
-click-plugins==1.1.1
-cligj==0.7.2
-colorama==0.4.6
-defusedxml==0.7.1
-diff-match-patch==20230430
-django-import-export==3.3.1
-et-xmlfile==1.1.0
-Fiona==1.9.4.post1
-geopandas==0.13.2
-jmespath==1.0.1
-MarkupPy==1.14
-numpy==1.25.2
-odfpy==1.4.1
-openpyxl==3.1.2
-packaging==23.1
-pandas==2.0.3
-psycopg2==2.9.7
-psycopg2-binary==2.9.7
-pyparsing==3.1.1
-pyproj==3.6.0
-python-dateutil==2.8.2
-pytz==2023.3
-PyYAML==6.0.1
-rasterio==1.3.8
-s3transfer==0.6.2
-shapely==2.0.1
-six==1.16.0
-snuggs==1.4.7
-tablib==3.5.0
-urllib3==1.26.16
-xlrd==2.0.1
-xlwt==1.3.0
+asttokens==2.2.1
+backcall==0.2.0
+colorama==0.4.6
+coverage==7.2.7
+decorator==5.1.1
+defusedxml==0.7.1
+diff-match-patch==20230430
+django-colorfield==0.9.0
+django-import-export==3.2.0
+et-xmlfile==1.1.0
+executing==1.2.0
+fonttools==4.25.0
+ipython==8.14.0
+jedi==0.18.2
+MarkupPy==1.14
+matplotlib-inline==0.1.6
+munkres==1.1.4
+nested-lookup==0.2.25
+odfpy==1.4.1
+openpyxl==3.1.2
+pandas-highcharts==0.5.2
+parso==0.8.3
+pickleshare==0.7.5
+Pillow==9.4.0
+ply==3.11
+prompt-toolkit==3.0.38
+pure-eval==0.2.2
+Pygments==2.15.1
+PyYAML==6.0
+stack-data==0.6.2
+tablib==3.4.0
+traitlets==5.9.0
+typing_extensions==4.6.3
+uuid==1.30
+wcwidth==0.2.6
+xlrd==2.0.1
+xlwt==1.3.0

.idea/modules.xml

@@ -11,7 +11,7 @@ class AOIFeatureAdmin(ImportExportModelAdmin, admin.ModelAdmin):
 
 
 class CurrentTaskAdmin(ImportExportModelAdmin, admin.ModelAdmin):
-    list_display = ('id','overall_progress')
+    list_display = ('id','stage_progress')
 
 
 class PilotCountryAdmin(ImportExportModelAdmin, admin.ModelAdmin):

.idea/workspace.xml

@@ -564,11 +564,15 @@ def get_available_fcs(collection):
     owner = collection.owner
     scap_admin = User.objects.get(username='scap_admin')
 
+    available_states = ["Processed", "Available"]
+
     available_fcs_scap = []
     if owner != scap_admin:
-        available_fcs_scap = list(ForestCoverCollection.objects.filter(owner=scap_admin))
+        available_fcs_scap = list(ForestCoverCollection.objects.filter(owner=scap_admin,
+                                                                       processing_status__in=available_states))
 
-    available_fcs = list(ForestCoverCollection.objects.filter(owner=owner)) + available_fcs_scap
+    available_fcs = (list(ForestCoverCollection.objects.filter(owner=owner, processing_status__in=available_states)) +
+                     available_fcs_scap)
 
     return available_fcs
 
@@ -577,11 +581,15 @@ def get_available_aois(collection):
     owner = collection.owner
     scap_admin = User.objects.get(username='scap_admin')
 
+    available_states = ["Processed", "Available"]
+
     available_aois_scap = []
     if owner != scap_admin:
-        available_aois_scap = list(AOICollection.objects.filter(owner=scap_admin))
+        available_aois_scap = list(AOICollection.objects.filter(owner=scap_admin,
+                                                                processing_status__in=available_states))
 
-    available_aois = list(AOICollection.objects.filter(owner=owner)) + available_aois_scap
+    available_aois = (list(AOICollection.objects.filter(owner=owner, processing_status__in=available_states)) +
+                      available_aois_scap)
 
     return available_aois
 
@@ -590,11 +598,15 @@ def get_available_agbs(collection):
     owner = collection.owner
     scap_admin = User.objects.get(username='scap_admin')
 
+    available_states = ["Processed", "Available"]
+
     available_agbs_scap = []
     if owner != scap_admin:
-        available_agbs_scap = list(AGBCollection.objects.filter(owner=scap_admin))
+        available_agbs_scap = list(AGBCollection.objects.filter(owner=scap_admin,
+                                                                processing_status__in=available_states))
 
-    available_agbs = list(AGBCollection.objects.filter(owner=owner)) + available_agbs_scap
+    available_agbs = (list(AGBCollection.objects.filter(owner=owner, processing_status__in=available_states)) +
+                      available_agbs_scap)
 
     return available_agbs