making surveys file match main branch

configs/docker/build/Dockerfile

@@ -40,7 +40,7 @@ ARG UNAME=ewsmanager
 ARG UID=1006
 ARG GID=1008
 RUN groupadd -g $GID $GNAME
-RUN useradd -l -m -u $UID -g $GID -o -s /bin/bash $UNAME
+RUN useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
 USER $UNAME
 
 RUN echo $PYTHONPATH

coordinator/ProcessorSurveysnewODK2.py

@@ -51,7 +51,7 @@ def get_newODK2_form_as_csv(form_credentials: dict, jobPath: str, config: dict,
             'today' : ('parse_date',(('name_out','today'),('fmt_in','%Y-%m-%d'))),
             'deviceid' : 'deviceid',
             'imei' : 'imei',
-            'phonenumber' : 'None',
+            #'phonenumber' : 'None',
             'username' : 'username',
             'surveyor_information/region' : 'None',
             'surveyor_information/country' : 'surveyor_infromation-country',
@@ -73,7 +73,7 @@ def get_newODK2_form_as_csv(form_credentials: dict, jobPath: str, config: dict,
             'site_information/area_unit' : 'None',
             'site_information/field_area' : 'None',
             'site_information/field_area_in_ha' : 'site_information-field_area',
-            'site_information/variety' : 'site_information-variety',
+            #'site_information/variety_eth' : 'site_information-variety',
             'site_information/survey_site_other' : 'None',
             'major_observed_diseases' : 'None',
             'SR/SR_incidence' : ('parse_cases',(('name_out','stem_rust-stemrust_incidence'),('cases', cases_incident),('fillna','none'))),
@@ -95,12 +95,12 @@ def get_newODK2_form_as_csv(form_credentials: dict, jobPath: str, config: dict,
             'septoria/septoria_incidence' : 'septoria-septoria_incidence',
             'septoria/septoria_severity' : 'septoria-septoria_severity',
             'septoria/septoria_image' : 'None',
-            'blast/blast_incidence' : 'None',
-            'blast/blast_severity' : 'None',
-            'blast/blast_image' : 'None',
-            'SB/SB_incidence' : 'None',
-            'SB/SB_severity' : 'None',
-            'SB/SB_image' : 'None',
+            #'blast/blast_incidence' : 'None',
+            #'blast/blast_severity' : 'None',
+            #'blast/blast_image' : 'None',
+            #'SB/SB_incidence' : 'None',
+            #'SB/SB_severity' : 'None',
+            #'SB/SB_image' : 'None',
             'FHB/FHB_incidence' : 'None',
             'FHB/FHB_severity' : 'None',
             'FHB/FHB_image' : 'None',