diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 371c69d..6ac027d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04] + os: [ubuntu-latest] include: - - os: ubuntu-18.04 + - os: ubuntu-latest PLATFORM: Linux-x86_64 # - os: ubuntu-latest # PLATFORM: Linux-x86_64 @@ -32,8 +32,8 @@ jobs: shell: bash -l {0} run: | export NVM_VERSION=0.39.0 - export NODE_VERSION=16.15.0 - export NPM_VERSION=6.14.15 + export NODE_VERSION=18.17.0 + export NPM_VERSION=8.5.5 export NVM_DIR="$HOME/.nvm" curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v$NVM_VERSION/install.sh | bash echo "Setting up the variables to run nvm" @@ -50,6 +50,7 @@ jobs: fi npm install -g npm@6.14 npm install enketo-transformer + npm install libxslt - name: Run the transformer script shell: bash -l {0} @@ -60,8 +61,8 @@ jobs: - name: Commit run: | - git config --global user.name 'asiripanich' - git config --global user.email '17020181+asiripanich@users.noreply.github.com' + git config --global user.name 'GitHub Action' + git config --global user.email 'action@github.com' git add data-json git commit --no-verify -m 'Update data-json' || echo "No changes to commit" git push || echo "No changes to commit" diff --git a/data-json/Maliheh-test.json b/data-json/Maliheh-test.json index 3018bea..c1023e3 100644 --- a/data-json/Maliheh-test.json +++ b/data-json/Maliheh-test.json @@ -1 +1 @@ -{"languageMap":{},"form":"
\n

Demographic questions

Personal information (1/2)

What is your age?*\n
This field is required
What is your gender?*\n
This field is required
What is your race?*\n
This field is required
Which of the following best describes your current employment status?*\n
This field is required
Are you an essential worker during this COVID-19 pandemic?*\n
This field is required
In what industry would you classify your workplace?*Please select one of the below\n
This field is required
What is your annual income?*\n
This field is required
What is your highest level of education attained?*\n
This field is required
Are you currently studying?*\n
This field is required
Which ticket type is your transit smartcard?*\n
This field is required
Do you have a driving licence? **\n
This field is required
\n

Household characteristics (2/2)

What is your household type?*Select the option that best describes your household type\n
This field is required
How many passenger cars does your household own?*\n
This field is required
How many bicycles does your household own?*\n
This field is required
What is your household's home ownership status?*\n
This field is required
What is your household's annual income?*Include all incomes.\n
This field is required
\n
Please select the modes you used to travel.you can select multiple modes\n
","model":"<_user_id/><__version__/>","transformerVersion":"2.1.7"} \ No newline at end of file +{"form":"
\n

Demographic questions

Personal information (1/2)

What is your age?*\n
This field is required
What is your gender?*\n
This field is required
What is your race?*\n
This field is required
Which of the following best describes your current employment status?*\n
This field is required
Are you an essential worker during this COVID-19 pandemic?*\n
This field is required
In what industry would you classify your workplace?*Please select one of the below\n
This field is required
What is your annual income?*\n
This field is required
What is your highest level of education attained?*\n
This field is required
Are you currently studying?*\n
This field is required
Which ticket type is your transit smartcard?*\n
This field is required
Do you have a driving licence? **\n
This field is required
\n

Household characteristics (2/2)

What is your household type?*Select the option that best describes your household type\n
This field is required
How many passenger cars does your household own?*\n
This field is required
How many bicycles does your household own?*\n
This field is required
What is your household's home ownership status?*\n
This field is required
What is your household's annual income?*Include all incomes.\n
This field is required
\n
Please select the modes you used to travel.you can select multiple modes\n
","model":"<_user_id/><__version__/>","languageMap":{},"transformerVersion":"4.0.0"} \ No newline at end of file diff --git a/data-json/add-scooter.json b/data-json/add-scooter.json index 3a09735..11f5dfb 100644 --- a/data-json/add-scooter.json +++ b/data-json/add-scooter.json @@ -1 +1 @@ -{"languageMap":{},"form":"
\n

Maliheh-test- [Fourstep] Trip confirm survey

What were the purposes of this trip?*More than one purpose can be selected.\n
A trip can either be valid or not valid, it cannot be both.This field is required
What were the modes of transport used in this trip?*More than one transport mode can be selected.\n
This field is required
Total people in trip party*Including yourself\n
This field is required
Non-household member(s) on trip*\n
This field is required
Vehicle trip: Parking location*\n
This field is required
","model":"10100<__version__/>","transformerVersion":"2.1.7"} \ No newline at end of file +{"form":"
\n

Maliheh-test- [Fourstep] Trip confirm survey

What were the purposes of this trip?*More than one purpose can be selected.\n
A trip can either be valid or not valid, it cannot be both.This field is required
What were the modes of transport used in this trip?*More than one transport mode can be selected.\n
This field is required
Total people in trip party*Including yourself\n
This field is required
Non-household member(s) on trip*\n
This field is required
Vehicle trip: Parking location*\n
This field is required
","model":"10100<__version__/>","languageMap":{},"transformerVersion":"4.0.0"} \ No newline at end of file diff --git a/data-json/test-place-time-use.json b/data-json/test-place-time-use.json new file mode 100644 index 0000000..3e275db --- /dev/null +++ b/data-json/test-place-time-use.json @@ -0,0 +1 @@ +{"form":"
\n

Place Time Use

\n \n \n
1- Where is this place?\n
\n

2- Please select activities you have done at home:

Caring for own children or adults\n
\n
\n
Checking social media\n
\n
\n
Cleaning and tidying\n
\n
\n
Contact family/ friends on a call\n
\n
\n
Doing laundry\n
\n
\n
Eating and drinking\n
\n
\n
Exercising\n
\n
\n
Meditation\n
\n
\n
Online grocery shopping\n
\n
\n
Online other shopping\n
\n
\n
Paying household bills\n
\n
\n
Personal hygiene\n
\n
\n
Pet care activities\n
\n
\n
Play video games\n
\n
\n
Preparing meals or snacks\n
\n
\n
Reading book for personal interest\n
\n
\n
Repairing and gardening\n
\n
\n
Sleeping\n
\n
\n
Studying for University\n
\n
\n
Work from home main job\n
\n
\n
Work from home other job\n
\n
\n
Watching TV, Netflix, YouTube, etc.\n
\n
\n
No activity, just relaxing or thinking\n
\n
\n
Other\n
\n
\n
\n
\n \n
","model":"\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n ","languageMap":{},"transformerVersion":"4.0.0"} \ No newline at end of file diff --git a/data-json/timeuse-survey-form.json b/data-json/timeuse-survey-form.json new file mode 100644 index 0000000..8a65ab1 --- /dev/null +++ b/data-json/timeuse-survey-form.json @@ -0,0 +1 @@ +{"form":"
\n

Time-use Survey Form

\n \n \n

Time-use questions

Activity Type:*In case of multi-tasking, you can select multiple activities.\n
This field is required
Personal Care Activities:*\n
This field is required
Employment-Related and Educational Activities*\n
This field is required
Maintenance Activities*\n
This field is required
Recreation and Leisure Activities*\n
This field is required
Voluntary Work and Care Activities*\n
This field is required
\n
\n \n
","model":"\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n ","languageMap":{"English (en)":"en"},"transformerVersion":"4.0.0"} \ No newline at end of file diff --git a/data-json/trip-confirm-survey-form-sydney-bike-survey.json b/data-json/trip-confirm-survey-form-sydney-bike-survey.json index e1684e1..be4bf22 100644 --- a/data-json/trip-confirm-survey-form-sydney-bike-survey.json +++ b/data-json/trip-confirm-survey-form-sydney-bike-survey.json @@ -1 +1 @@ -{"languageMap":{},"form":"
\n

[Fourstep] Trip confirm survey

What were the purposes of this trip?*More than one purpose can be selected.\n
A trip can either be valid or not valid, it cannot be both.This field is required
What were the modes of transport used in this trip?*More than one transport mode can be selected.\n
This field is required
Total people in trip party*Including yourself\n
This field is required
Non-household member(s) on trip*\n
This field is required
Vehicle trip: Parking location*\n
This field is required
","model":"10100<__version__/>","transformerVersion":"2.1.7"} \ No newline at end of file +{"form":"
\n

[Fourstep] Trip confirm survey

What were the purposes of this trip?*More than one purpose can be selected.\n
A trip can either be valid or not valid, it cannot be both.This field is required
What were the modes of transport used in this trip?*More than one transport mode can be selected.\n
This field is required
Total people in trip party*Including yourself\n
This field is required
Non-household member(s) on trip*\n
This field is required
Vehicle trip: Parking location*\n
This field is required
","model":"10100<__version__/>","languageMap":{},"transformerVersion":"4.0.0"} \ No newline at end of file diff --git a/data-json/trip-confirm-survey-form.json b/data-json/trip-confirm-survey-form.json index 90e5690..2dbecb5 100644 --- a/data-json/trip-confirm-survey-form.json +++ b/data-json/trip-confirm-survey-form.json @@ -1 +1 @@ -{"languageMap":{},"form":"
\n

Trip confirm survey

\n \n \n
What were the purposes of this trip?*More than one purpose can be selected.\n
A trip can either be valid or not valid, it cannot be both.This field is required
\n
What were the modes of transport used in this trip?*More than one transport mode can be selected.\n
This field is required
\n
Total people in trip party*Including yourself\n
This field is required
\n
Non-household member(s) on trip*\n
This field is required
\n
Vehicle trip: Parking location*\n
This field is required
\n \n \n \n \n
","model":"\n \n \n \n \n \n 1\n 0\n 1\n 0\n 0\n \n \n \n \n \n \n \n \n ","transformerVersion":"2.1.7"} \ No newline at end of file +{"form":"
\n

Trip confirm survey

\n \n \n
What were the purposes of this trip?*More than one purpose can be selected.\n
A trip can either be valid or not valid, it cannot be both.This field is required
\n
What were the modes of transport used in this trip?*More than one transport mode can be selected.\n
This field is required
\n
Total people in trip party*Including yourself\n
This field is required
\n
Non-household member(s) on trip*\n
This field is required
\n
Vehicle trip: Parking location*\n
This field is required
\n \n \n \n \n
","model":"\n \n \n \n \n \n 1\n 0\n 1\n 0\n 0\n \n \n \n \n \n \n \n \n ","languageMap":{},"transformerVersion":"4.0.0"} \ No newline at end of file diff --git a/data-xml/test-place-time-use.xml b/data-xml/test-place-time-use.xml new file mode 100644 index 0000000..84e2a09 --- /dev/null +++ b/data-xml/test-place-time-use.xml @@ -0,0 +1,699 @@ + + + + Place Time Use + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + home + + + + work + + + + other + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data-xml/timeuse-survey-form.xml b/data-xml/timeuse-survey-form.xml index 9630267..9f08edf 100644 --- a/data-xml/timeuse-survey-form.xml +++ b/data-xml/timeuse-survey-form.xml @@ -1,341 +1,180 @@ - time-use-survey-form + Time-use Survey Form - + Time-use questions - + Start Date - + Start Time - + End Date - + End Time - + Activity Type: - + In case of multi-tasking, you can select multiple activities. - + Personal Care Activities - + Employment-Related and Educational Activities - + Maintenance Activities - + Recreation and Leisure Activities - + Voluntary Work and Care Activities - + Other... - + Personal Care Activities: - + Sleeping - + Resting and Relaxing - + Eating or Drinking - + Doing Sport - + Appointments - + Personal Care i.e. Wash, Dress (Grooming (Self)) - + Employment-Related and Educational Activities - + Working at Main Job - + Working at Other Job - + Studying at An Educational Institute i.e. University, Online Learning Platforms - + Checking Emails - + Maintenance Activities - + Preparing Meals or Snacks - + Cleaning and Tidying - + Doing Laundry - + Grocery Shopping - + Online Grocery Shopping - + Repairs and Gardening - + Paying Household Bills - + Recreation and Leisure Activities - + Watching TV (Movie, News, Online Like Netflix, ...) - + Listening to Radio, Podcasts, Music - + Playing Video Games - + Non-grocery Shopping - + Online Non-grocery Shopping - + Spending Time With Family/Friends - + Contact Friends/Family on a Voice Call or Video Call - + Reading Books - + Spending Time on Social Media (Instagram, YouTube, ...) - + Eating Out - + Voluntary Work and Care Activities - + Caring for Own Children - + Caring for Other Children - + Caring for Adults - + Pet Care Activities - + Attending Religious Services - + Other Voluntary Works - + Other: - + If your activity type is not included within the provided options, please enter it in the box below. - - - Preguntas sobre el uso del tiempo - - - Fecha - - - Hora de inicio - - - Fecha - - - Hora de finalización - - - Tipo de actividad: - - - En caso de multitarea, puede seleccionar varias actividades. - - - Actividades de cuidado personal - - - Actividades relacionadas con el empleo y la educación - - - Actividades domesticas - - - Recreación y ocio - - - Trabajo voluntario y actividades de cuidado - - - Otro... - - - Actividades de cuidado personal: - - - Durmiendo - - - Descansando y relajándose - - - Comer o beber - - - Haciendo deporte - - - Equipo - - - Cuidado personal, es decir, lavarse, vestirse (asearse (uno mismo)) - - - Actividades relacionadas con el empleo y la educación - - - Trabajando en trabajo principal - - - Trabajando en otro trabajo - - - Estudiar en un instituto educativo, es decir, universidades, plataformas de aprendizaje en línea - - - Actividades domesticas - - - Preparar comidas o meriendas - - - Limpieza y orden - - - Lavando - - - Compras de comestibles - - - Reparaciones y jardinería - - - Pagar las facturas del hogar - - - Recreación y ocio - - - Ver televisión (películas, noticias, en línea como Netflix, ...) - - - Escuchar radio, podcasts, música. - - - Jugando videojuegos - - - Compras no comestibles - - - Pasar tiempo con la familia/amigos - - - Póngase en contacto con amigos/familiares en una llamada de voz o videollamada - - - Libros de lectura - - - Trabajo voluntario y actividades de cuidado - - - Cuidar de los propios hijos - - - Cuidando a otros niños - - - Cuidando a los adultos - - - Actividades de cuidado de mascotas - - - Asistir a servicios religiosos - - - Otras obras de voluntariado - - - Otro: - - - Si su tipo de actividad no está incluido dentro de las opciones proporcionadas, introdúzcalo en el cuadro a continuación. - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + @@ -347,218 +186,218 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - -