Merge branch 'develop' – Date of orientation to PER process status

Author: szabozoltan69

main/runserver.sh

@@ -10,11 +10,10 @@ python manage.py collectstatic --noinput -l
 
 # Add server name(s) to django settings and nginx - later maybe only nginx would be enough, and ALLOWED_HOSTS could be "*"
 NGINX_API_FQDN=$(echo $API_FQDN | sed 's|https://||')
+sed -i 's!\$NGINX_SERVER_NAME!'$NGINX_API_FQDN'!g' /etc/nginx/sites-available/nginx.conf
 if [ "$GO_ENVIRONMENT"x = productionx ]; then
-    sed -i 's/\$NGINX_SERVER_NAME/'$NGINX_API_FQDN' api.go.ifrc.org/g' /etc/nginx/sites-available/nginx.conf
     sed -i 's/CHANGE_ME_BEFORE_START/prod/' /etc/nginx/sites-available/nginx.conf
 else
-    sed -i 's/\$NGINX_SERVER_NAME/'$NGINX_API_FQDN'/g' /etc/nginx/sites-available/nginx.conf
     sed -i 's/CHANGE_ME_BEFORE_START/'$GO_ENVIRONMENT'/' /etc/nginx/sites-available/nginx.conf
 fi
 

per/serializers.py

@@ -608,6 +608,7 @@ class Meta:
         fields = (
             "id",
             "assessment_number",
+            "date_of_orientation",
             "date_of_assessment",
             "country",
             "country_details",
@@ -658,6 +659,7 @@ class Meta:
         fields = (
             "id",
             "assessment_number",
+            "date_of_orientation",
             "date_of_assessment",
             "country",
             "country_details",