4 yıl önce · ad01fc0d19
--- a/package.json
+++ b/package.json
@@ -19,7 +19,9 @@
 
				     "@capacitor/ios": "5.5.0",
			
 
				     "@capacitor/keyboard": "5.0.6",
			
 
				     "@capacitor/preferences": "^5.0.6",
			
 
				+    "@capacitor/push-notifications": "^5.1.0",
			
 
				     "@capacitor/status-bar": "5.0.6",
			
 
				+    "@codetrix-studio/capacitor-google-auth": "^3.3.4",
			
 
				     "@ionic/vue": "^7.0.0",
			
 
				     "@ionic/vue-router": "^7.0.0",
			
 
				     "@vimeo/player": "^2.20.1",
			
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,5 +5,13 @@
 
				 </template>
			
 
				 
			
 
				 <script setup lang="ts">
			
 
				-import { IonApp, IonRouterOutlet } from '@ionic/vue';
			
 
				+import { IonApp, IonRouterOutlet, onIonViewWillEnter } from '@ionic/vue';
			
 
				+import { defineComponent, onMounted } from 'vue';
			
 
				+
			
 
				+
			
 
				+
			
 
				+onIonViewWillEnter(() => {
			
 
				+  console.log("Init On Mouting")
			
 
				+});
			
 
				+
			
 
				 </script>
			
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -63,3 +63,17 @@ export const listMats = async  () => {
 
				   console.log(data)
			
 
				   return data.results
			
 
				 }
			
 
				+
			
 
				+export const storeAPNToken = async (device_token) => {
			
 
				+  
			
 
				+  const token = await Preferences.get({ key: 'token' });
			
 
				+  console.log("token = ", token)
			
 
				+  const { data } = await axios.post(BASE_URL + "backend/api/device_tokens/",{token: device_token},
			
 
				+  {
			
 
				+    headers: { 
			
 
				+    'Authorization': `Token ${token.value}`
			
 
				+    }
			
 
				+  })
			
 
				+  console.log(data)
			
 
				+  return data
			
 
				+}
			
--- a/src/views/ProfilePage.vue
+++ b/src/views/ProfilePage.vue
@@ -7,8 +7,13 @@
 
				     </ion-header>
			
 
				     <ion-content>
			
 
				       <div class="example-content">Listen now content</div>
			
 
				-      <ion-button @click='fbLogout' v-if='isLogin'>Facebook Logout</ion-button>
			
 
				-      <ion-button @click='fbLogin' v-else>Facebook Login</ion-button>
			
 
				+      <template v-if="isLogin">
			
 
				+      <ion-button @click='fbLogout'>Logout</ion-button>
			
 
				+      </template>
			
 
				+      <template v-else>
			
 
				+        <ion-button @click='fbLogin'>Facebook Login</ion-button>
			
 
				+        <ion-button @click='ggLogin'>Google Login</ion-button>
			
 
				+      </template>
			
 
				     </ion-content>
			
 
				   </ion-page>
			
 
				 </template>
			
@@ -16,6 +21,12 @@
 
				 <script setup lang="ts">
			
 
				 import { IonPage, IonHeader, IonToolbar, IonTitle, IonContent, IonButton, onIonViewWillEnter } from '@ionic/vue';
			
 
				 import ExploreContainer from '@/components/ExploreContainer.vue';
			
 
				+import { defineComponent, onMounted } from 'vue';
			
 
				+import { GoogleAuth } from '@codetrix-studio/capacitor-google-auth';
			
 
				+
			
 
				+onMounted(() => {
			
 
				+  GoogleAuth.initialize();
			
 
				+});
			
 
				 
			
 
				 import {
			
 
				   FacebookLogin,
			
@@ -33,6 +44,15 @@ const FACEBOOK_PERMISSIONS = [
 
				 
			
 
				 const isLogin = ref(false)
			
 
				 
			
 
				+const ggLogin = async () => {
			
 
				+  const response = await GoogleAuth.signIn();
			
 
				+  console.log(response);
			
 
				+  console.log(response.accessToken)
			
 
				+  if( response.authentication.accessToken ) {
			
 
				+    isLogin.value = true
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				 const fbLogin = async () => {
			
 
				   const result = await (<FacebookLoginResponse>(
			
 
				     FacebookLogin.login({ permissions: FACEBOOK_PERMISSIONS })
			
@@ -60,6 +80,7 @@ onIonViewWillEnter(async () => {
 
				   }else {
			
 
				     isLogin.value = false
			
 
				   }
			
 
				+  ggCheckLogin()
			
 
				 
			
 
				 })
			
 
				 const getProfile = async () => {
			
@@ -69,4 +90,17 @@ const getProfile = async () => {
 
				 
			
 
				   console.log(`Facebook user's email is ${result.email}`);
			
 
				 }
			
 
				+const ggCheckLogin = async() => {
			
 
				+    GoogleAuth.refresh()
			
 
				+        .then((data) => {
			
 
				+            if (data.accessToken) {
			
 
				+                isLogin.value = true
			
 
				+            }
			
 
				+        })
			
 
				+        .catch((error) => {
			
 
				+            if (error.type === 'userLoggedOut') {
			
 
				+                //this.signin()
			
 
				+            }
			
 
				+        });
			
 
				+}
			
 
				 </script>
			
--- a/src/views/Tab1Page.vue
+++ b/src/views/Tab1Page.vue
@@ -79,10 +79,13 @@ import { IonPage, IonHeader, IonToolbar, IonTitle, IonContent, IonIcon, onIonVie
 
				 import ExploreContainer  from '@/components/ExploreContainer.vue';
			
 
				 import { CapacitorHttp } from '@capacitor/core';
			
 
				 import { ref } from 'vue';
			
 
				-import { TOKEN, getProducts, setToken, getObject, getToken, getTrainers, listMats } from '@/settings';
			
 
				+import { TOKEN, getProducts, setToken, getObject, getToken, getTrainers, listMats, storeAPNToken } from '@/settings';
			
 
				 //import VueCoreVideoPlayer from 'vue-core-video-player'
			
 
				 import { vueVimeoPlayer } from 'vue-vimeo-player'
			
 
				 
			
 
				+import { GoogleAuth } from '@codetrix-studio/capacitor-google-auth';
			
 
				+
			
 
				+import { PushNotifications } from '@capacitor/push-notifications';
			
 
				 
			
 
				 import Player from '@vimeo/player';
			
 
				 
			
@@ -127,6 +130,9 @@ const mats = ref()
 
				     mats.value = await listMats()
			
 
				     console.log(" trainers => ", trainers)
			
 
				 
			
 
				+    GoogleAuth.initialize();
			
 
				+    registerNotifications()
			
 
				+    addListeners()
			
 
				   })
			
 
				 
			
 
				   onIonViewWillLeave(() => {
			
@@ -145,4 +151,41 @@ const mats = ref()
 
				     const response: HttpResponse = await CapacitorHttp.get(options);
			
 
				     console.log(response)
			
 
				   }
			
 
				+const addListeners = async () => {
			
 
				+  await PushNotifications.addListener('registration', token => {
			
 
				+    console.info('Registration token: ', token.value);
			
 
				+    storeAPNToken(token.value)
			
 
				+  });
			
 
				+
			
 
				+  await PushNotifications.addListener('registrationError', err => {
			
 
				+    console.error('Registration error: ', err.error);
			
 
				+  });
			
 
				+
			
 
				+  await PushNotifications.addListener('pushNotificationReceived', notification => {
			
 
				+    console.log('Push notification received: ', notification);
			
 
				+  });
			
 
				+
			
 
				+  await PushNotifications.addListener('pushNotificationActionPerformed', notification => {
			
 
				+    console.log('Push notification action performed', notification.actionId, notification.inputValue);
			
 
				+  });
			
 
				+}
			
 
				+
			
 
				+const registerNotifications = async () => {
			
 
				+  let permStatus = await PushNotifications.checkPermissions();
			
 
				+
			
 
				+  if (permStatus.receive === 'prompt') {
			
 
				+    permStatus = await PushNotifications.requestPermissions();
			
 
				+  }
			
 
				+
			
 
				+  if (permStatus.receive !== 'granted') {
			
 
				+    throw new Error('User denied permissions!');
			
 
				+  }
			
 
				+
			
 
				+  await PushNotifications.register();
			
 
				+}
			
 
				+
			
 
				+const getDeliveredNotifications = async () => {
			
 
				+  const notificationList = await PushNotifications.getDeliveredNotifications();
			
 
				+  console.log('delivered notifications', notificationList);
			
 
				+}
			
 
				 </script>
			
--- a/.DS_Store
+++ b/.DS_Store
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,10 @@
 
				 # syntax=docker/dockerfile:1
			
 
				 FROM python:3
			
 
				 ENV PYTHONUNBUFFERED=1
			
 
				+ADD ./app /code
			
 
				 WORKDIR /code
			
 
				-COPY requirements.txt /code/
			
 
				 RUN apt-get update && apt-get install -y \
			
 
				         gettext \
			
 
				         xfonts-thai \
			
 
				         gdal-bin libgdal-dev python3-gdal binutils libproj-dev
			
 
				 RUN pip install -r requirements.txt
			
 
				-COPY . /code/
			
--- a/app/.DS_Store
+++ b/app/.DS_Store
--- a/app/backend/.DS_Store
+++ b/app/backend/.DS_Store
--- a/app/backend/__init__.py
+++ b/app/backend/__init__.py
--- a/app/backend/__pycache__/__init__.cpython-39.pyc
+++ b/app/backend/__pycache__/__init__.cpython-39.pyc
--- a/app/backend/__pycache__/admin.cpython-39.pyc
+++ b/app/backend/__pycache__/admin.cpython-39.pyc
--- a/app/backend/__pycache__/apps.cpython-39.pyc
+++ b/app/backend/__pycache__/apps.cpython-39.pyc
--- a/app/backend/__pycache__/models.cpython-39.pyc
+++ b/app/backend/__pycache__/models.cpython-39.pyc
--- a/app/backend/__pycache__/urls.cpython-39.pyc
+++ b/app/backend/__pycache__/urls.cpython-39.pyc
--- a/app/backend/__pycache__/views.cpython-39.pyc
+++ b/app/backend/__pycache__/views.cpython-39.pyc
--- a/backend/admin.py
+++ b/backend/admin.py
@@ -1,18 +1,46 @@
 
				 from django.contrib import admin
			
 
				 from django.contrib.gis.admin import OSMGeoAdmin
			
 
				-from .models import Hospital, Patient, Bed, PatientLog, Driver, Ambulance, AmbulanceTicket, Place
			
 
				+from .models import Hospital, Patient, Bed, PatientLog, Driver, Ambulance, AmbulanceTicket, Place, Points, ImportFile
			
 
				 from django_google_maps import widgets as map_widgets
			
 
				 from django_google_maps import fields as map_fields
			
 
				 from django_json_widget.widgets import JSONEditorWidget
			
 
				 from django.db import models
			
 
				-
			
 
				+from django.utils.html import format_html
			
 
				+from django.conf import settings
			
 
				 
			
 
				 #@admin.register(Bed)
			
 
				 
			
 
				+@admin.register(ImportFile)
			
 
				+class ImportFileAdmin(admin.ModelAdmin):
			
 
				+    pass
			
 
				+
			
 
				 @admin.register(AmbulanceTicket)
			
 
				 class AmbulanceTicketAdmin(admin.ModelAdmin):
			
 
				     list_display = ('driver', 'ambulance', 'checkin_at', 'checkout_at', 'status')
			
 
				 
			
 
				+@admin.register(Points)
			
 
				+class PointAdmin(admin.ModelAdmin):
			
 
				+    readonly_fields = ('distance', 'duration', 'get_map')
			
 
				+    formfield_overrides = {
			
 
				+        map_fields.AddressField: {'widget': map_widgets.GoogleMapsAddressWidget},
			
 
				+        models.JSONField: {'widget': JSONEditorWidget},
			
 
				+    }
			
 
				+
			
 
				+    def get_map(self, obj):
			
 
				+         return format_html( f'''
			
 
				+<br>
			
 
				+<div>
			
 
				+<iframe
			
 
				+  width="100%"
			
 
				+  height="450"
			
 
				+  style="border:0"
			
 
				+  loading="lazy"
			
 
				+  allowfullscreen
			
 
				+  src="https://www.google.com/maps/embed/v1/directions?key={settings.GOOGLE_MAPS_API_KEY}&origin={obj.geolocation.lat},{obj.geolocation.lon}&destination={obj.dest.geolocation.lat},{obj.dest.geolocation.lon}"></iframe></div>''')
			
 
				+
			
 
				+    fields = ('dest', 'address', 'geolocation', 'distance', 'duration', 'directions','get_map' )
			
 
				+    #pass
			
 
				+
			
 
				 @admin.register(Place)
			
 
				 class PlaceAdmin(admin.ModelAdmin):
			
 
				     formfield_overrides = {
			
@@ -51,7 +79,12 @@ class HospitalAdmin(OSMGeoAdmin):
 
				 
			
 
				 @admin.register(Patient)
			
 
				 class PatientAdmin(admin.ModelAdmin):
			
 
				+    readonly_fields = ('nearby_places', )
			
 
				     formfield_overrides = {
			
 
				         map_fields.AddressField: {'widget': map_widgets.GoogleMapsAddressWidget},
			
 
				     }
			
 
				     inlines = [PatientLogAdmin,]
			
 
				+
			
 
				+    def nearby_places(self, obj):
			
 
				+        r = obj.nearby()
			
 
				+        return format_html(r)
			
--- a/app/backend/apps.py
+++ b/app/backend/apps.py
--- a/app/backend/migrations/0001_initial.py
+++ b/app/backend/migrations/0001_initial.py
--- a/app/backend/migrations/0002_hospital_geolocation.py
+++ b/app/backend/migrations/0002_hospital_geolocation.py
--- a/app/backend/migrations/0003_alter_hospital_address.py
+++ b/app/backend/migrations/0003_alter_hospital_address.py
--- a/app/backend/migrations/0004_alter_hospital_location.py
+++ b/app/backend/migrations/0004_alter_hospital_location.py
--- a/app/backend/migrations/0005_hospital_address_text.py
+++ b/app/backend/migrations/0005_hospital_address_text.py
--- a/app/backend/migrations/0006_bed_patient.py
+++ b/app/backend/migrations/0006_bed_patient.py
--- a/app/backend/migrations/0007_auto_20210718_0249.py
+++ b/app/backend/migrations/0007_auto_20210718_0249.py
--- a/app/backend/migrations/0008_auto_20210718_0659.py
+++ b/app/backend/migrations/0008_auto_20210718_0659.py
--- a/app/backend/migrations/0009_auto_20210718_0702.py
+++ b/app/backend/migrations/0009_auto_20210718_0702.py
--- a/app/backend/migrations/0010_auto_20210718_0713.py
+++ b/app/backend/migrations/0010_auto_20210718_0713.py
--- a/app/backend/migrations/0011_auto_20210718_0722.py
+++ b/app/backend/migrations/0011_auto_20210718_0722.py
--- a/app/backend/migrations/0012_patient_comment.py
+++ b/app/backend/migrations/0012_patient_comment.py
--- a/app/backend/migrations/0013_patientlog.py
+++ b/app/backend/migrations/0013_patientlog.py
--- a/app/backend/migrations/0014_alter_patientlog_bed.py
+++ b/app/backend/migrations/0014_alter_patientlog_bed.py
--- a/app/backend/migrations/0015_alter_patientlog_bed.py
+++ b/app/backend/migrations/0015_alter_patientlog_bed.py
--- a/app/backend/migrations/0016_auto_20210718_1031.py
+++ b/app/backend/migrations/0016_auto_20210718_1031.py
--- a/app/backend/migrations/0017_ambulance_driver.py
+++ b/app/backend/migrations/0017_ambulance_driver.py
--- a/app/backend/migrations/0018_ambulance_color.py
+++ b/app/backend/migrations/0018_ambulance_color.py
--- a/app/backend/migrations/0019_ambulanceticket.py
+++ b/app/backend/migrations/0019_ambulanceticket.py
--- a/app/backend/migrations/0020_driver_status.py
+++ b/app/backend/migrations/0020_driver_status.py
--- a/app/backend/migrations/0021_auto_20210719_0014.py
+++ b/app/backend/migrations/0021_auto_20210719_0014.py
--- a/app/backend/migrations/0022_auto_20210719_0024.py
+++ b/app/backend/migrations/0022_auto_20210719_0024.py
--- a/app/backend/migrations/0023_place.py
+++ b/app/backend/migrations/0023_place.py
--- a/app/backend/migrations/0024_points.py
+++ b/app/backend/migrations/0024_points.py
@@ -0,0 +1,22 @@
 
				+# Generated by Django 3.2.5 on 2021-07-19 08:11
			
 
				+
			
 
				+from django.db import migrations, models
			
 
				+import django.db.models.deletion
			
 
				+
			
 
				+
			
 
				+class Migration(migrations.Migration):
			
 
				+
			
 
				+    dependencies = [
			
 
				+        ('backend', '0023_place'),
			
 
				+    ]
			
 
				+
			
 
				+    operations = [
			
 
				+        migrations.CreateModel(
			
 
				+            name='Points',
			
 
				+            fields=[
			
 
				+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
			
 
				+                ('dest', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dest', to='backend.place')),
			
 
				+                ('src', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='src', to='backend.place')),
			
 
				+            ],
			
 
				+        ),
			
 
				+    ]
			
--- a/app/backend/migrations/0025_auto_20210721_1145.py
+++ b/app/backend/migrations/0025_auto_20210721_1145.py
@@ -0,0 +1,28 @@
 
				+# Generated by Django 3.2.5 on 2021-07-21 04:45
			
 
				+
			
 
				+from django.db import migrations
			
 
				+import django_google_maps.fields
			
 
				+
			
 
				+
			
 
				+class Migration(migrations.Migration):
			
 
				+
			
 
				+    dependencies = [
			
 
				+        ('backend', '0024_points'),
			
 
				+    ]
			
 
				+
			
 
				+    operations = [
			
 
				+        migrations.RemoveField(
			
 
				+            model_name='points',
			
 
				+            name='src',
			
 
				+        ),
			
 
				+        migrations.AddField(
			
 
				+            model_name='points',
			
 
				+            name='address',
			
 
				+            field=django_google_maps.fields.AddressField(max_length=200, null=True),
			
 
				+        ),
			
 
				+        migrations.AddField(
			
 
				+            model_name='points',
			
 
				+            name='geolocation',
			
 
				+            field=django_google_maps.fields.GeoLocationField(max_length=100, null=True),
			
 
				+        ),
			
 
				+    ]
			
--- a/app/backend/migrations/0026_auto_20210721_1218.py
+++ b/app/backend/migrations/0026_auto_20210721_1218.py
@@ -0,0 +1,23 @@
 
				+# Generated by Django 3.2.5 on 2021-07-21 05:18
			
 
				+
			
 
				+from django.db import migrations, models
			
 
				+
			
 
				+
			
 
				+class Migration(migrations.Migration):
			
 
				+
			
 
				+    dependencies = [
			
 
				+        ('backend', '0025_auto_20210721_1145'),
			
 
				+    ]
			
 
				+
			
 
				+    operations = [
			
 
				+        migrations.AddField(
			
 
				+            model_name='points',
			
 
				+            name='distance',
			
 
				+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=7, null=True),
			
 
				+        ),
			
 
				+        migrations.AddField(
			
 
				+            model_name='points',
			
 
				+            name='duration',
			
 
				+            field=models.CharField(blank=True, max_length=200, null=True),
			
 
				+        ),
			
 
				+    ]
			
--- a/app/backend/migrations/0027_auto_20210721_1251.py
+++ b/app/backend/migrations/0027_auto_20210721_1251.py
@@ -0,0 +1,23 @@
 
				+# Generated by Django 3.2.5 on 2021-07-21 05:51
			
 
				+
			
 
				+from django.db import migrations, models
			
 
				+
			
 
				+
			
 
				+class Migration(migrations.Migration):
			
 
				+
			
 
				+    dependencies = [
			
 
				+        ('backend', '0026_auto_20210721_1218'),
			
 
				+    ]
			
 
				+
			
 
				+    operations = [
			
 
				+        migrations.AddField(
			
 
				+            model_name='points',
			
 
				+            name='directions',
			
 
				+            field=models.JSONField(blank=True, null=True),
			
 
				+        ),
			
 
				+        migrations.AlterField(
			
 
				+            model_name='points',
			
 
				+            name='distance',
			
 
				+            field=models.DecimalField(blank=True, decimal_places=2, max_digits=7, null=True, verbose_name='Distance (km)'),
			
 
				+        ),
			
 
				+    ]
			
--- a/app/backend/migrations/0028_place_title.py
+++ b/app/backend/migrations/0028_place_title.py
@@ -0,0 +1,18 @@
 
				+# Generated by Django 3.2.5 on 2021-07-21 10:11
			
 
				+
			
 
				+from django.db import migrations, models
			
 
				+
			
 
				+
			
 
				+class Migration(migrations.Migration):
			
 
				+
			
 
				+    dependencies = [
			
 
				+        ('backend', '0027_auto_20210721_1251'),
			
 
				+    ]
			
 
				+
			
 
				+    operations = [
			
 
				+        migrations.AddField(
			
 
				+            model_name='place',
			
 
				+            name='title',
			
 
				+            field=models.CharField(blank=True, max_length=200, null=True),
			
 
				+        ),
			
 
				+    ]
			
--- a/app/backend/migrations/0029_importfile.py
+++ b/app/backend/migrations/0029_importfile.py
@@ -0,0 +1,20 @@
 
				+# Generated by Django 3.2.5 on 2021-07-22 08:04
			
 
				+
			
 
				+from django.db import migrations, models
			
 
				+
			
 
				+
			
 
				+class Migration(migrations.Migration):
			
 
				+
			
 
				+    dependencies = [
			
 
				+        ('backend', '0028_place_title'),
			
 
				+    ]
			
 
				+
			
 
				+    operations = [
			
 
				+        migrations.CreateModel(
			
 
				+            name='ImportFile',
			
 
				+            fields=[
			
 
				+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
			
 
				+                ('hospital_file', models.FileField(blank=True, upload_to='uploads/%Y/%m/%d/', verbose_name='Hospital (csv)')),
			
 
				+            ],
			
 
				+        ),
			
 
				+    ]
			
--- a/app/backend/migrations/__init__.py
+++ b/app/backend/migrations/__init__.py
--- a/app/backend/migrations/__pycache__/0001_initial.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0001_initial.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0002_hospital_geolocation.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0002_hospital_geolocation.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0003_alter_hospital_address.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0003_alter_hospital_address.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0004_alter_hospital_location.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0004_alter_hospital_location.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0005_hospital_address_text.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0005_hospital_address_text.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0006_bed_patient.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0006_bed_patient.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0007_auto_20210718_0246.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0007_auto_20210718_0246.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0007_auto_20210718_0249.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0007_auto_20210718_0249.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0008_alter_patient_prefix.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0008_alter_patient_prefix.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0008_auto_20210718_0659.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0008_auto_20210718_0659.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0009_auto_20210718_0702.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0009_auto_20210718_0702.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0010_auto_20210718_0711.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0010_auto_20210718_0711.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0010_auto_20210718_0713.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0010_auto_20210718_0713.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0011_auto_20210718_0722.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0011_auto_20210718_0722.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0012_patient_comment.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0012_patient_comment.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0013_patientlog.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0013_patientlog.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0014_alter_patientlog_bed.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0014_alter_patientlog_bed.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0015_alter_patientlog_bed.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0015_alter_patientlog_bed.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0016_auto_20210718_1031.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0016_auto_20210718_1031.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0017_ambulance_driver.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0017_ambulance_driver.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0018_ambulance_color.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0018_ambulance_color.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0019_ambulanceticket.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0019_ambulanceticket.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0020_driver_status.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0020_driver_status.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0021_auto_20210719_0014.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0021_auto_20210719_0014.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0022_auto_20210719_0024.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0022_auto_20210719_0024.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0023_place.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0023_place.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0024_points.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0024_points.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0025_auto_20210721_1145.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0025_auto_20210721_1145.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0026_auto_20210721_1218.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0026_auto_20210721_1218.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0027_auto_20210721_1251.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0027_auto_20210721_1251.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0028_place_title.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0028_place_title.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/0029_importfile.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/0029_importfile.cpython-39.pyc
--- a/app/backend/migrations/__pycache__/__init__.cpython-39.pyc
+++ b/app/backend/migrations/__pycache__/__init__.cpython-39.pyc
--- a/backend/models.py
+++ b/backend/models.py
@@ -8,6 +8,13 @@ from smart_selects.db_fields import (
 
				     ChainedManyToManyField,
			
 
				     GroupedForeignKey,
			
 
				 )
			
 
				+import googlemaps
			
 
				+from django.contrib.gis.geos import fromstr
			
 
				+
			
 
				+from django.conf import settings
			
 
				+import csv
			
 
				+
			
 
				+gmaps = googlemaps.Client(key=settings.GOOGLE_MAPS_API_KEY)
			
 
				 # Create your models here.
			
 
				 GENDER_CHOICES = (
			
 
				     ('นางสาว','นางสาว'),
			
@@ -122,9 +129,66 @@ class Patient(models.Model):
 
				     comment  = models.TextField(blank=True, null=True)
			
 
				     #test
			
 
				     def __str__(self):
			
 
				+        #self.nearby()
			
 
				         return f"{self.first_name} {self.last_name}"
			
 
				 
			
 
				+
			
 
				+    def nearby(self):
			
 
				+        r = gmaps.places_nearby(location=(self.geolocation.lat, self.geolocation.lon), type="hospital", radius=10000)
			
 
				+        bd = ""
			
 
				+        for r0 in r['results']:
			
 
				+            openh = "-"
			
 
				+            if 'opening_hours' in r0:
			
 
				+                openh = r0['opening_hours']['open_now']
			
 
				+            else:
			
 
				+                openh = "-"
			
 
				+
			
 
				+            bd += f"<tr><td>{r0['name']}</td><td>{openh}</td><td>{r0['vicinity']}</td></tr>"
			
 
				+
			
 
				+        rt = f'''
			
 
				+<br>
			
 
				+        <table><thead><tr><th>Name</th><th>Opening Hours</th><th>Vicinity</th></tr></thead>
			
 
				+        <tbody>
			
 
				+            {bd}
			
 
				+        </tbody>
			
 
				+        </table>
			
 
				+        '''
			
 
				+        return rt
			
 
				+
			
 
				+
			
 
				+
			
 
				+class ImportFile(models.Model):
			
 
				+    hospital_file  = models.FileField(upload_to="uploads/%Y/%m/%d/", blank=True, verbose_name="Hospital (csv)")
			
 
				+
			
 
				+    def save(self, *args, **kwargs):
			
 
				+        super(ImportFile, self).save(*args, **kwargs)
			
 
				+
			
 
				+        with self.hospital_file.open('r') as csv_file:
			
 
				+            csv_reader = csv.reader(csv_file, delimiter=',')
			
 
				+            Hospital.objects.all().delete()
			
 
				+            line_count = 0
			
 
				+
			
 
				+            for r in csv_reader:
			
 
				+                if line_count > 0:
			
 
				+                    print(r)
			
 
				+                    print(f"{r[7]},{r[6]}")
			
 
				+                    try:
			
 
				+                        gp = map_fields.GeoPt(lat=float(r[6]), lon=float(r[7]))
			
 
				+
			
 
				+                        location = fromstr(f'POINT({r[7]} {r[6]})', srid=4326)
			
 
				+                        print(location)
			
 
				+                        h = Hospital(title=r[3], address_text=r[5], geolocation=gp, address=r[3])
			
 
				+                        h.save()
			
 
				+                    except Exception as e:
			
 
				+                        print(e)
			
 
				+
			
 
				+                line_count += 1
			
 
				+
			
 
				+
			
 
				+
			
 
				 class Place(models.Model):
			
 
				+    #title  = models.Char
			
 
				+    title = models.CharField(max_length=200, blank=True, null=True)
			
 
				     address = map_fields.AddressField(max_length=200)
			
 
				     geolocation = map_fields.GeoLocationField(max_length=100)
			
 
				 
			
@@ -133,6 +197,36 @@ class Place(models.Model):
 
				 
			
 
				     more_info  = models.JSONField(null=True, blank=True)
			
 
				 
			
 
				+    def __str__(self):
			
 
				+        return f"{self.address} ({self.geolocation})"
			
 
				+class Points(models.Model):
			
 
				+    #src  = models.ForeignKey(Place, on_delete=models.SET_NULL, null=True, blank=False, related_name='src')
			
 
				+    dest  = models.ForeignKey(Place, on_delete=models.SET_NULL, null=True, blank=False, related_name='dest')
			
 
				+    address = map_fields.AddressField(max_length=200, null=True)
			
 
				+    geolocation = map_fields.GeoLocationField(max_length=100, null=True)
			
 
				+
			
 
				+    distance = models.DecimalField(null=True, blank=True, decimal_places=2, max_digits=7, verbose_name="Distance (km)")
			
 
				+    duration = models.CharField(max_length=200, null=True, blank=True)
			
 
				+
			
 
				+    directions  = models.JSONField(null=True, blank=True)
			
 
				+
			
 
				+    def save(self, *args, **kwargs):
			
 
				+        geocode_result = gmaps.geocode('1600 Amphitheatre Parkway, Mountain View, CA')
			
 
				+        print(geocode_result)
			
 
				+        print(self.geolocation)
			
 
				+        origin = [(self.geolocation.lat, self.geolocation.lon)]
			
 
				+        dest = [(self.dest.geolocation.lat, self.dest.geolocation.lon)]
			
 
				+        dst = gmaps.distance_matrix(origin, dest)
			
 
				+        dirs = gmaps.directions(origin[0], dest[0])
			
 
				+        self.directions = dirs
			
 
				+        print(dirs)
			
 
				+        self.distance = dst['rows'][0]['elements'][0]['distance']['value'] / 1000
			
 
				+        self.duration = dst['rows'][0]['elements'][0]['duration']['text']
			
 
				+        print(dst)
			
 
				+        super(Points, self).save(*args, **kwargs)
			
 
				+
			
 
				+
			
 
				+
			
 
				 class Hospital(models.Model):
			
 
				     title = models.CharField(max_length=200)
			
 
				     location = models.PointField(blank=True, null=True)
			
@@ -190,3 +284,5 @@ class PatientLog(models.Model):
 
				     updated_at = models.DateTimeField(auto_now=True)
			
 
				 
			
 
				 
			
 
				+
			
 
				+
			
--- a/app/backend/templates/backend/import_file.html
+++ b/app/backend/templates/backend/import_file.html
@@ -0,0 +1,7 @@
 
				+{% extends "base.html" %}
			
 
				+
			
 
				+{% block title %}My amazing blog{% endblock %}
			
 
				+
			
 
				+{% block content %}
			
 
				+Import File
			
 
				+{% endblock %}
			
--- a/app/backend/templates/backend/index.html
+++ b/app/backend/templates/backend/index.html
@@ -0,0 +1,8 @@
 
				+{% extends "base.html" %}
			
 
				+
			
 
				+{% block title %}My amazing blog{% endblock %}
			
 
				+
			
 
				+{% block content %}
			
 
				+Hello world
			
 
				+<a href="{% url "import_file" %}">Import</a>
			
 
				+{% endblock %}
			
--- a/app/backend/tests.py
+++ b/app/backend/tests.py
--- a/backend/urls.py
+++ b/backend/urls.py
@@ -4,4 +4,5 @@ from . import views
 
				 
			
 
				 urlpatterns = [
			
 
				     path('', views.index, name='index'),
			
 
				+    path('import_file', views.import_file, name='import_file'),
			
 
				 ]
			
--- a/app/backend/views.py
+++ b/app/backend/views.py
@@ -0,0 +1,11 @@
 
				+from django.shortcuts import render
			
 
				+
			
 
				+# Create your views here.
			
 
				+from django.http import HttpResponse
			
 
				+
			
 
				+
			
 
				+def index(request):
			
 
				+    return render(request, 'backend/index.html')
			
 
				+
			
 
				+def import_file(request):
			
 
				+    return render(request, 'backend/import_file.html')
			
--- a/app/manage.py
+++ b/app/manage.py
--- a/app/media/uploads/2021/07/18/67224.jpg
+++ b/app/media/uploads/2021/07/18/67224.jpg
--- a/app/media/uploads/2021/07/22/citizeninfo_health_20200314.csv
+++ b/app/media/uploads/2021/07/22/citizeninfo_health_20200314.csv
--- a/app/media/uploads/2021/07/22/citizeninfo_health_20200314_W9jk8Vu.csv
+++ b/app/media/uploads/2021/07/22/citizeninfo_health_20200314_W9jk8Vu.csv
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,3 +5,4 @@ django-smart-selects
 
				 django-colorfield
			
 
				 googlemaps
			
 
				 django-json-widget
			
 
				+django-import-export
			
--- a/app/shaqfindbed/__init__.py
+++ b/app/shaqfindbed/__init__.py
--- a/app/shaqfindbed/__pycache__/__init__.cpython-39.pyc
+++ b/app/shaqfindbed/__pycache__/__init__.cpython-39.pyc
--- a/app/shaqfindbed/__pycache__/settings.cpython-39.pyc
+++ b/app/shaqfindbed/__pycache__/settings.cpython-39.pyc
--- a/shaqfindbed/__pycache__/urls.cpython-39.pyc
+++ b/shaqfindbed/__pycache__/urls.cpython-39.pyc
--- a/app/shaqfindbed/__pycache__/wsgi.cpython-39.pyc
+++ b/app/shaqfindbed/__pycache__/wsgi.cpython-39.pyc
--- a/app/shaqfindbed/asgi.py
+++ b/app/shaqfindbed/asgi.py
--- a/shaqfindbed/settings.py
+++ b/shaqfindbed/settings.py
@@ -33,12 +33,13 @@ ALLOWED_HOSTS = []
 
				 # Application definition
			
 
				 
			
 
				 INSTALLED_APPS = [
			
 
				+    'django.contrib.staticfiles',
			
 
				     'django.contrib.admin',
			
 
				     'django.contrib.auth',
			
 
				     'django.contrib.contenttypes',
			
 
				     'django.contrib.sessions',
			
 
				     'django.contrib.messages',
			
 
				-    'django.contrib.staticfiles',
			
 
				+    'import_export',
			
 
				     'django_google_maps',
			
 
				     'django.contrib.gis',
			
 
				     'smart_selects',
			
@@ -62,7 +63,7 @@ ROOT_URLCONF = 'shaqfindbed.urls'
 
				 TEMPLATES = [
			
 
				     {
			
 
				         'BACKEND': 'django.template.backends.django.DjangoTemplates',
			
 
				-        'DIRS': [],
			
 
				+        'DIRS': [os.path.join(BASE_DIR, 'templates')],
			
 
				         'APP_DIRS': True,
			
 
				         'OPTIONS': {
			
 
				             'context_processors': [
			
--- a/shaqfindbed/urls.py
+++ b/shaqfindbed/urls.py
@@ -23,7 +23,7 @@ urlpatterns = [
 
				     path('backend/', include('backend.urls')),
			
 
				     path('admin/', admin.site.urls),
			
 
				     url(r'^chaining/', include('smart_selects.urls')),
			
 
				-]
			
 
				+] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
			
 
				 
			
 
				 if settings.DEBUG:
			
 
				     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
			
--- a/app/shaqfindbed/wsgi.py
+++ b/app/shaqfindbed/wsgi.py
--- a/app/static/.DS_Store
+++ b/app/static/.DS_Store
--- a/app/static/admin/.DS_Store
+++ b/app/static/admin/.DS_Store
--- a/app/static/admin/css/autocomplete.css
+++ b/app/static/admin/css/autocomplete.css
--- a/staticfile/admin/css/base.css
+++ b/staticfile/admin/css/base.css
tum 687bd14b20 first commit		3 anos atrás
..
tmt_learning	687bd14b20 first commit	3 anos atrás
authentication.py	687bd14b20 first commit	3 anos atrás
manage.py	687bd14b20 first commit	3 anos atrás
server-entrypoint.sh	687bd14b20 first commit	3 anos atrás
worker-entrypoint.sh	687bd14b20 first commit	3 anos atrás