Skip to content
GitLab
Explorer
Connexion
S'inscrire
Navigation principale
Rechercher ou aller à…
Projet
LanguageLab
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Wiki
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Extraits de code
Déploiement
Releases
Registre de paquets
Registre de conteneur
Registre de modèles
Opération
Modules Terraform
Surveillance
Incidents
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse du dépôt
Expériences du modèle
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté
Contribuer à GitLab
Donner votre avis
Conditions générales et politique de confidentialité
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Serge Bibauw
LanguageLab
Validations
817635d0
Valider
817635d0
rédigé
Il y a 2 mois
par
Delphine van Rossum
Validation de
Brieuc Dubois
Il y a 2 mois
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
Correction Alembic script
parent
9ea44d10
Aucune branche associée trouvée
Aucune étiquette associée trouvée
2 requêtes de fusion
!43
Merge dev into main
,
!42
Correction Alembic script
Modifications
2
Masquer les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
backend/alembic/versions/c4ff1cfa66b7_study_data_divided_in_more_field.py
+38
-12
38 ajouts, 12 suppressions
...versions/c4ff1cfa66b7_study_data_divided_in_more_field.py
frontend/src/routes/admin/studies/[id]/+page.server.ts
+13
-5
13 ajouts, 5 suppressions
frontend/src/routes/admin/studies/[id]/+page.server.ts
avec
51 ajouts
et
17 suppressions
backend/alembic/versions/c4ff1cfa66b7_study_data_divided_in_more_field.py
+
38
−
12
Voir le fichier @
817635d0
...
@@ -20,18 +20,44 @@ depends_on: Union[str, Sequence[str], None] = None
...
@@ -20,18 +20,44 @@ depends_on: Union[str, Sequence[str], None] = None
def
upgrade
()
->
None
:
def
upgrade
()
->
None
:
op
.
drop_column
(
"
studies
"
,
"
consent_study_data
"
)
with
op
.
batch_alter_table
(
"
studies
"
)
as
batch_op
:
op
.
add_column
(
batch_op
.
drop_column
(
"
consent_study_data
"
)
"
studies
"
,
sa
.
Column
(
"
study_data_organisation
"
,
sa
.
String
,
nullable
=
False
)
batch_op
.
add_column
(
)
sa
.
Column
(
op
.
add_column
(
"
studies
"
,
sa
.
Column
(
"
study_data_address
"
,
sa
.
String
,
nullable
=
False
))
"
study_data_organisation
"
,
sa
.
String
,
nullable
=
False
,
server_default
=
""
op
.
add_column
(
"
studies
"
,
sa
.
Column
(
"
study_data_contact
"
,
sa
.
String
,
nullable
=
False
))
),
op
.
add_column
(
"
studies
"
,
sa
.
Column
(
"
study_data_email
"
,
sa
.
String
,
nullable
=
False
))
)
batch_op
.
add_column
(
sa
.
Column
(
"
study_data_address
"
,
sa
.
String
,
nullable
=
False
,
server_default
=
""
),
)
batch_op
.
add_column
(
sa
.
Column
(
"
study_data_contact
"
,
sa
.
String
,
nullable
=
False
,
server_default
=
""
),
)
batch_op
.
add_column
(
sa
.
Column
(
"
study_data_email
"
,
sa
.
String
,
nullable
=
False
,
server_default
=
""
),
)
with
op
.
batch_alter_table
(
"
studies
"
)
as
batch_op
:
batch_op
.
alter_column
(
"
study_data_organisation
"
,
server_default
=
None
)
batch_op
.
alter_column
(
"
study_data_address
"
,
server_default
=
None
)
batch_op
.
alter_column
(
"
study_data_contact
"
,
server_default
=
None
)
batch_op
.
alter_column
(
"
study_data_email
"
,
server_default
=
None
)
def
downgrade
()
->
None
:
def
downgrade
()
->
None
:
op
.
add_column
(
"
studies
"
,
sa
.
Column
(
"
consent_study_data
"
,
sa
.
String
,
nullable
=
False
))
with
op
.
batch_alter_table
(
"
studies
"
)
as
batch_op
:
op
.
drop_column
(
"
studies
"
,
"
study_data_organisation
"
)
batch_op
.
add_column
(
op
.
drop_column
(
"
studies
"
,
"
study_data_address
"
)
sa
.
Column
(
op
.
drop_column
(
"
studies
"
,
"
study_data_contact
"
)
"
consent_study_data
"
,
sa
.
String
,
nullable
=
False
,
server_default
=
""
op
.
drop_column
(
"
studies
"
,
"
study_data_email
"
)
),
)
batch_op
.
drop_column
(
"
study_data_organisation
"
)
batch_op
.
drop_column
(
"
study_data_address
"
)
batch_op
.
drop_column
(
"
study_data_contact
"
)
batch_op
.
drop_column
(
"
study_data_email
"
)
op
.
alter_column
(
"
studies
"
,
"
consent_study_data
"
,
server_default
=
None
)
Ce diff est replié.
Cliquez pour l'agrandir.
frontend/src/routes/admin/studies/[id]/+page.server.ts
+
13
−
5
Voir le fichier @
817635d0
...
@@ -17,7 +17,10 @@ export const actions: Actions = {
...
@@ -17,7 +17,10 @@ export const actions: Actions = {
const
consentParticipation
=
formData
.
get
(
'
consentParticipation
'
)?.
toString
();
const
consentParticipation
=
formData
.
get
(
'
consentParticipation
'
)?.
toString
();
const
consentPrivacy
=
formData
.
get
(
'
consentPrivacy
'
)?.
toString
();
const
consentPrivacy
=
formData
.
get
(
'
consentPrivacy
'
)?.
toString
();
const
consentRights
=
formData
.
get
(
'
consentRights
'
)?.
toString
();
const
consentRights
=
formData
.
get
(
'
consentRights
'
)?.
toString
();
const
consentStudyData
=
formData
.
get
(
'
consentStudyData
'
)?.
toString
();
const
studyOrganisation
=
formData
.
get
(
'
StudyOrganisation
'
)?.
toString
();
const
studyAddress
=
formData
.
get
(
'
StudyAddress
'
)?.
toString
();
const
studyContact
=
formData
.
get
(
'
StudyContact
'
)?.
toString
();
const
studyPIemail
=
formData
.
get
(
'
StudyPIemail
'
)?.
toString
();
if
(
if
(
!
title
||
!
title
||
...
@@ -27,9 +30,12 @@ export const actions: Actions = {
...
@@ -27,9 +30,12 @@ export const actions: Actions = {
!
consentParticipation
||
!
consentParticipation
||
!
consentPrivacy
||
!
consentPrivacy
||
!
consentRights
||
!
consentRights
||
!
consentStudyData
!
studyOrganisation
||
!
studyAddress
||
!
studyContact
||
!
studyPIemail
)
{
)
{
return
{
message
:
'
Invalid request
'
};
return
{
message
:
'
Invalid request
: : Missing required fields
'
};
}
}
const
startDate
=
new
Date
(
startDateStr
);
const
startDate
=
new
Date
(
startDateStr
);
...
@@ -67,10 +73,12 @@ export const actions: Actions = {
...
@@ -67,10 +73,12 @@ export const actions: Actions = {
consent_participation
:
consentParticipation
,
consent_participation
:
consentParticipation
,
consent_privacy
:
consentPrivacy
,
consent_privacy
:
consentPrivacy
,
consent_rights
:
consentRights
,
consent_rights
:
consentRights
,
consent_study_data
:
consentStudyData
,
study_data_organisation
:
studyOrganisation
,
study_data_address
:
studyAddress
,
study_data_contact
:
studyContact
,
study_data_email
:
studyPIemail
,
user_ids
user_ids
});
});
if
(
!
updated
)
return
{
message
:
'
Failed to update study
'
};
if
(
!
updated
)
return
{
message
:
'
Failed to update study
'
};
return
redirect
(
303
,
'
/admin/studies
'
);
return
redirect
(
303
,
'
/admin/studies
'
);
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter