Skip to content
Extraits de code Groupes Projets
Valider 817635d0 rédigé par Delphine van Rossum's avatar Delphine van Rossum Validation de Brieuc Dubois
Parcourir les fichiers

Correction Alembic script

parent 9ea44d10
Aucune branche associée trouvée
Aucune étiquette associée trouvée
2 requêtes de fusion!43Merge dev into main,!42Correction Alembic script
...@@ -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)
...@@ -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');
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter