Bringing fork upto date

Procfile

@@ -1,2 +1,2 @@
-web: ddtrace-run gunicorn floodrelief.wsgi --timeout 600
+web: gunicorn floodrelief.wsgi --timeout 600
 worker: python redis_worker.py

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status - Travis][0]][1] [![Open Source Helpers](https://www.codetriage.com/ieeekeralasection/rescuekerala/badges/users.svg)](https://www.codetriage.com/ieeekeralasection/rescuekerala)
 
-<p align="center">The Website for co-ordinating the rehabilitation of the people affected in the 2018 Kerala Floods.</p>
+<p align="center">The Website for co-ordinating the rehabilitation of the people affected in the Kerala Floods.</p>
 
 [![Join Kerala Rescue Slack channel](https://i.imgur.com/V7jxjak.png)](http://bit.ly/Keralarescuechat)
 
@@ -30,38 +30,7 @@
 [^top](#table-of-contents)
 
 #### Docker
-<details>
-<summary>
-These instructions will get you a copy of the Docker project up and running on your local machine for development and testing purposes.
-</summary>
-
-### Using Docker
-
-- Only pre-requisite is having docker and docker-compose installed
-- Execute `sh docker.sh` in this directory (if you do not have permissions on the `docker.sh`, do `chmod +x docker.sh`)
-- Server will start running at `localhost:8000`
-- `Ctrl+C` to stop
-
-#### Troubleshooting Docker
-* Incompatible docker version
-
- > ERROR: Version in "./docker-compose.yaml" is unsupported. You might be seeing this error because you're using the wrong Compose file version. Either specify a version of "2" (or "2.0") and place your service definitions under the `services` key, or omit the `version` key and place your service definitions at the root of the file to use version 1.
-For more on the Compose file format versions, see https://docs.docker.com/compose/compose-file/
-
-
-**Fix**
-
-Update your docker toolkit
-
-* Insufficient permissions
-> ERROR: Couldn't connect to Docker daemon at http+docker://localunixsocket - is it running?
-If it's at a non-standard location, specify the URL with the DOCKER_HOST environment variable.
-
-
-**Fix**
-
-Run it with sudo - `sudo sh docker.sh`
-</details>
+- Check out this [Wiki](https://github.com/IEEEKeralaSection/rescuekerala/wiki/Using-Docker) to see how to run docker for this project.
 
 #### [Python 3](https://www.python.org/downloads/)
 
@@ -120,9 +89,13 @@ https://github.com/vigneshhari/keralarescue_test_settings for local testing.
 
 <details>
 <summary>4. Install dependencies.</summary>
+
+```
+pip3 install -r requirements_debug.txt
+```
+
 
-        pip3 install -r requirements.txt
-        pip3 install -r requirements_debug.txt
+
 </details>
 
 <details>
@@ -218,6 +191,8 @@ You can help us with verifying user submitted request from our [Ushahidi volunte
 #### Contribution Guidelines
 Check out this [Wiki](https://github.com/IEEEKeralaSection/rescuekerala/wiki/Contribution-Guidelines) for our contribution guidelines.
 
+Please find issues that we need help [here](https://github.com/IEEEKeralaSection/rescuekerala/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22). Go through the comments in the issue to check if someone else is already working on it. Don't forget to drop a comment when you start working on it.
+
 
 <details>
 <summary>Testing PRs
@@ -281,3 +256,6 @@ has the bug number in the branch name.
 </details>
 
 <hr>
+
+### Flood Map
+You can find the repo for the Flood Map here : https://github.com/aswinmohanme/kerala-flood-map

docker-compose.yaml

@@ -5,6 +5,8 @@ services:
   db:
     image: postgres
     restart: always
+    ports:
+      - 5432:5432
 
   redis:
     image: redis

floodrelief/settings.py

@@ -72,7 +72,6 @@ def get_list(text):
     'rest_framework',
     'rest_framework.authtoken',
     'rest_auth',
-    'ddtrace.contrib.django',
 ]
 
 if DEBUG:
@@ -94,7 +93,7 @@ def get_list(text):
     MIDDLEWARE += ['debug_toolbar.middleware.DebugToolbarMiddleware']
 
 DEBUG_TOOLBAR_PANELS = [
-    'debug_toolbar.panels.timer.TimerDebugPanel',
+    'debug_toolbar.panels.timer.TimerPanel',
     'pympler.panels.MemoryPanel',
     'debug_toolbar.panels.versions.VersionsPanel',
     'debug_toolbar.panels.settings.SettingsPanel',
@@ -230,7 +229,7 @@ def get_list(text):
 S3_URL = "https://{}.s3.ap-south-1.amazonaws.com".format(bucket_name,)
 
 
-if os.environ.get('USE_S3'):
+if os.environ.get('USE_S3','').lower() == "true" :
     AWS_STORAGE_BUCKET_NAME=bucket_name
     AWS_ACCESS_KEY_ID=os.environ.get("AWS_ACCESS_KEY_ID")
     AWS_SECRET_ACCESS_KEY=os.environ.get("AWS_SECRET_ACCESS_KEY")

mainapp/admin.py

@@ -9,7 +9,8 @@
 from mainapp.redis_queue import bulk_csv_upload_queue
 from mainapp.csvimporter import import_inmate_file
 from .models import Request, Volunteer, Contributor, DistrictNeed, DistrictCollection, DistrictManager, vol_categories, \
-    RescueCamp, Person, NGO, Announcements, DataCollection , PrivateRescueCamp , CollectionCenter, CsvBulkUpload, RequestUpdate
+    RescueCamp, Person, NGO, Announcements, DataCollection , PrivateRescueCamp , CollectionCenter, CsvBulkUpload, RequestUpdate, \
+    Hospital
 
 """
 Helper function for streaming csv downloads
@@ -65,14 +66,17 @@ class RequestAdmin(admin.ModelAdmin):
     list_filter = ('district', 'status','dateadded')
 
     def mark_as_completed(self, request, queryset):
+        self.message_user(request, "Marked selected requests as completed.")
         queryset.update(status='sup')
         return
 
     def mark_as_new(self, request, queryset):
+        self.message_user(request, "Marked selected requests as new.")
         queryset.update(status='new')
         return
 
     def mark_as_ongoing(self, request, queryset):
+        self.message_user(request, "Marked selected requests as ongoing.")
         queryset.update(status='pro')
         return
 
@@ -214,6 +218,7 @@ class PersonAdmin(admin.ModelAdmin):
     list_display = ('name', 'camped_at', 'added_at', 'phone', 'age', 'gender', 'camped_at_district', 'camped_at_taluk')
     ordering = ('-added_at',)
     list_filter = ('camped_at__district', 'camped_at__taluk')
+    search_fields = ['camped_at__district', 'camped_at__name', 'name']
 
     def camped_at_taluk(self, instance):
         return instance.camped_at.taluk
@@ -252,7 +257,8 @@ def save_model(self, request, obj, form, change):
         )
     autocomplete_fields = ['camp']
     readonly_fields = ['is_completed', 'failure_reason']
-    list_display = ['name','camp','is_completed']
+    list_display = ['name', 'camp', 'is_completed']
+    search_fields = ['camp__name']
 
 admin.site.register(Request, RequestAdmin)
 admin.site.register(Volunteer, VolunteerAdmin)
@@ -267,5 +273,4 @@ def save_model(self, request, obj, form, change):
 admin.site.register(Announcements, AnnouncementAdmin)
 admin.site.register(Person, PersonAdmin)
 admin.site.register(DataCollection, DataCollectionAdmin)
-admin.site.register(CsvBulkUpload, CsvBulkUploadAdmin)
-admin.site.register(RequestUpdate, RequestUpdateAdmin)
+admin.site.register(Hospital)

mainapp/csvimporter.py

@@ -18,10 +18,9 @@ def parsedate(str):
                     return datetime.datetime.strptime(str, "%d/%m/%Y" )
         return None
     except :
-        print(str)
         return None
 
-def import_inmate_file(csvid):
+def import_inmate_file(csvid, is_recovery=False):
 
     import django
     django.setup()
@@ -51,6 +50,7 @@ def import_inmate_file(csvid):
             empty = 0
             header = ["name" , "phone" , "address" , "notes" , "district" , "checkin_date" , "checkout_date" , "gender" , "age" ]
             for i in header:
+                if(datum.get(i, "") == None):empty+=1;continue
                 if(datum.get(i, "").strip() == ""):empty+=1
             if(empty == len(header)):
                 continue
@@ -62,12 +62,15 @@ def import_inmate_file(csvid):
                 elif(datum.get("gender", "")[0] == "f" or datum.get("gender", "")[0] == "F"):
                     gender = 1
             age = '-1'
-            if(datum.get("age", "").strip() != ""):
-               age = datum.get("age", "").strip()
-
+            if(datum.get("age", "") != None):
+                if(datum.get("age", "").strip() != ""):
+                    age = datum.get("age", "").strip()
+            district = ""
+            if(datum.get("district", "") != None):
+                district = district.lower()
 
             Person(
-                name = datum.get("name", ""),
+                name = datum.get("name", "")[:50],
                 phone = datum.get("phone", ""),
                 age = int(float(age)),
                 gender = gender,
@@ -79,8 +82,12 @@ def import_inmate_file(csvid):
                 checkin_date = parsedate(datum.get("checkin_date", None)),
                 checkout_date = parsedate(datum.get("checkout_date", None))
             ).save()
-        CsvBulkUpload.objects.filter(id = csvid).update(is_completed = True)
-        CsvBulkUpload.objects.filter(id = csvid).update(failure_reason = '')
+
+        if is_recovery:
+            csv_name = CsvBulkUpload.objects.get(id=csvid).name
+            CsvBulkUpload.objects.filter(id = csvid).update(is_completed = True, failure_reason = '', name="rec-"+csv_name[:15])
+        else:
+            CsvBulkUpload.objects.filter(id = csvid).update(is_completed = True, failure_reason = '')
     except Exception as e:
         CsvBulkUpload.objects.filter(id = csvid).update(failure_reason=(getattr(e, 'message', repr(e))))
 

mainapp/management/recover_csv.py

@@ -0,0 +1,15 @@
+from mainapp.models import CsvBulkUpload
+from mainapp.redis_queue import bulk_csv_upload_queue
+from mainapp.csvimporter import import_inmate_file
+
+incompleted_csv_imports = CsvBulkUpload.objects.filter(is_completed=False, failure_reason__icontains="long")
+
+
+for csv in incompleted_csv_imports:
+    bulk_csv_upload_queue.enqueue(
+        import_inmate_file, csv.pk, True
+    )
+
+
+#For Shell Testing
+#exec(open('mainapp/management/recover_csv.py').read())

mainapp/migrations/0092_auto_20180828_1407.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1 on 2018-08-28 08:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mainapp', '0091_merge_20180825_1236'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='request',
+            name='is_request_for_others',
+            field=models.BooleanField(default=False, verbose_name='Requesting for others - മറ്റൊരാൾക്ക് വേണ്ടി അപേക്ഷിക്കുന്നു '),
+        ),
+    ]

mainapp/migrations/0093_auto_20180902_1802.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1 on 2018-09-02 12:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mainapp', '0092_auto_20180828_1407'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='person',
+            name='name',
+            field=models.CharField(max_length=51, verbose_name='Name - പേര്'),
+        ),
+    ]

mainapp/migrations/0094_auto_20180902_2329.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1 on 2018-09-02 17:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mainapp', '0093_auto_20180902_1802'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='person',
+            name='phone',
+            field=models.CharField(blank=True, max_length=14, null=True, verbose_name='Mobile - മൊബൈൽ'),
+        ),
+    ]

mainapp/migrations/0095_hospital.py

@@ -0,0 +1,26 @@
+# Generated by Django 2.1.2 on 2019-08-09 07:07
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mainapp', '0094_auto_20180902_2329'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Hospital',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=200)),
+                ('officer', models.CharField(max_length=100)),
+                ('designation', models.CharField(max_length=250)),
+                ('landline', models.CharField(max_length=14, validators=[django.core.validators.RegexValidator(code='invalid_mobile', message='Please Enter 10/11 digit mobile number or landline as 0<std code><phone number>', regex='^((\\+91|91|0)[\\- ]{0,1})?[456789]\\d{9}$')])),
+                ('mobile', models.CharField(max_length=14, validators=[django.core.validators.RegexValidator(code='invalid_mobile', message='Please Enter 10/11 digit mobile number or landline as 0<std code><phone number>', regex='^((\\+91|91|0)[\\- ]{0,1})?[456789]\\d{9}$')])),
+                ('email', models.EmailField(max_length=254)),
+            ],
+        ),
+    ]

mainapp/models.py

@@ -132,8 +132,7 @@ class Request(models.Model):
     latlng_accuracy = models.CharField(max_length=100, verbose_name='GPS Accuracy - GPS കൃത്യത ', blank=True)
     #  If it is enabled no need to consider lat and lng
     is_request_for_others = models.BooleanField(
-        verbose_name='Requesting for others - മറ്റൊരാൾക്ക് വേണ്ടി അപേക്ഷിക്കുന്നു  ', default=False,
-        help_text="If this is checked, enter other's location from the \'Enter location manually\' button at the bottom")
+        verbose_name='Requesting for others - മറ്റൊരാൾക്ക് വേണ്ടി അപേക്ഷിക്കുന്നു ', default=False)
 
     needwater = models.BooleanField(verbose_name='Water - വെള്ളം')
     needfood = models.BooleanField(verbose_name='Food - ഭക്ഷണം')
@@ -174,6 +173,8 @@ def summarise(self):
             out += "\nToilet Requirements :\n {}".format(self.detailtoilet)
         if(self.needkit_util):
             out += "\nKit Requirements :\n {}".format(self.detailkit_util)
+        if(self.needrescue):
+            out += "\nRescue Action :\n {}".format(self.detailrescue)    
         if(len(self.needothers.strip()) != 0):
             out += "\nOther Needs :\n {}".format(self.needothers)
         return out
@@ -450,8 +451,8 @@ def __str__(self):
 
 
 class Person(models.Model):
-    name = models.CharField(max_length=30,blank=False,null=False,verbose_name="Name - പേര്")
-    phone = models.CharField(max_length=11,null=True,blank=True,verbose_name='Mobile - മൊബൈൽ')
+    name = models.CharField(max_length=51,blank=False,null=False,verbose_name="Name - പേര്")
+    phone = models.CharField(max_length=14,null=True,blank=True,verbose_name='Mobile - മൊബൈൽ')
     age = models.IntegerField(null=True,blank=True,verbose_name="Age - പ്രായം")
     gender = models.IntegerField(
         choices = gender,
@@ -673,3 +674,16 @@ def full_clean(self, *args, **kwargs):
 
     def __str__(self):
         return self.name
+
+class Hospital(models.Model):
+    name = models.CharField(max_length=200)
+    officer = models.CharField(max_length=100)
+    designation = models.CharField(max_length=250, verbose_name="Officer name")
+    phone_number_regex = RegexValidator(regex='^((\+91|91|0)[\- ]{0,1})?[456789]\d{9}$', message='Please Enter 10/11 digit mobile number or landline as 0<std code><phone number>', code='invalid_mobile')
+    landline = models.CharField(max_length=14, validators=[phone_number_regex])
+    mobile = models.CharField(max_length=14, validators=[phone_number_regex])
+    email = models.EmailField()
+
+    def __str__(self):
+        return self.name + ' - ' + self.designation
+

mainapp/templates/mainapp/camp_details.html

@@ -4,8 +4,8 @@
 
 {% block content %}  
   <div class="text-right">
-    <a href="/coordinator_home">Coordinator Home</a> | 
-    <a href="/logout">Logout</a>
+      <a href="{%url 'coordinator_home' %}">Coordinator Home</a> | 
+      <a href="{%url 'user_logout' %}">Logout</a>
   </div>
 
   <h3 class="text-center">

mainapp/templates/mainapp/camp_requirements.html

@@ -4,8 +4,8 @@
 
 {% block content %}  
   <div class="text-right">
-    <a href="/coordinator_home">Coordinator Home</a> | 
-    <a href="/logout">Logout</a>
+    <a href="{%url 'coordinator_home' %}">Coordinator Home</a> | 
+    <a href="{%url 'user_logout' %}">Logout</a>
   </div>
 
   <h3 class="text-center">