From 3d106eea5dc746095013369b9fe4e2126f53f18b Mon Sep 17 00:00:00 2001 From: anaritadauane Date: Thu, 14 Mar 2024 16:47:45 +0200 Subject: [PATCH 1/7] Added a description line to the import spreadsheet template --- cgi/generate_sample_import_file.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cgi/generate_sample_import_file.pl b/cgi/generate_sample_import_file.pl index 85d263e95eedd..7daab151a2728 100755 --- a/cgi/generate_sample_import_file.pl +++ b/cgi/generate_sample_import_file.pl @@ -59,14 +59,22 @@ mandatory => $workbook->add_format(border => 1, bold => 1, bg_color => '#aaffcc'), recommended => $workbook->add_format(border => 1, bold => 1, bg_color => '#ccffdd'), optional => $workbook->add_format(border => 1, bold => 1, bg_color => '#eeffee'), + description => workbook->add_format(italic => 1, text_wrap => 1, align => 'left', align => 'vcenter'), ); # Re-use the structure used to output select2 options in import_file_select_format.pl my $select2_options_ref = generate_import_export_columns_groups_for_select2([$lc]); my $headers_row = 0; +my $description_row = 1; my $col = 0; +my $comment; +my $field_id; + +$worksheet->set_column('A:A', 30); +$worksheet->write( $description_row, 0, "Description", $formats{'description'}); + foreach my $group_ref (@$select2_options_ref) { my $group_start_col = $col; @@ -184,7 +192,7 @@ $worksheet->set_column($col, $col, $width); if ($comment ne "") { - $worksheet->write_comment($headers_row, $col, $comment); + $worksheet->write_comment($description_row, $col, $comment, $formats{'description'}); } $col++; From 9bee810483032826fb59d1354b45e02137348781 Mon Sep 17 00:00:00 2001 From: anaritadauane Date: Thu, 14 Mar 2024 17:16:44 +0200 Subject: [PATCH 2/7] Added a description line to the import spreadsheet template --- cgi/generate_sample_import_file.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/cgi/generate_sample_import_file.pl b/cgi/generate_sample_import_file.pl index 7daab151a2728..442c6e3ce8f53 100755 --- a/cgi/generate_sample_import_file.pl +++ b/cgi/generate_sample_import_file.pl @@ -69,8 +69,6 @@ my $description_row = 1; my $col = 0; -my $comment; -my $field_id; $worksheet->set_column('A:A', 30); $worksheet->write( $description_row, 0, "Description", $formats{'description'}); From 6c2f4054bddcd8c9ebb91d7af5333c38fbe632cb Mon Sep 17 00:00:00 2001 From: anaritadauane Date: Fri, 15 Mar 2024 01:39:45 +0200 Subject: [PATCH 3/7] Fixed the errors --- cgi/generate_sample_import_file.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cgi/generate_sample_import_file.pl b/cgi/generate_sample_import_file.pl index 442c6e3ce8f53..2e92e540880f2 100755 --- a/cgi/generate_sample_import_file.pl +++ b/cgi/generate_sample_import_file.pl @@ -59,7 +59,7 @@ mandatory => $workbook->add_format(border => 1, bold => 1, bg_color => '#aaffcc'), recommended => $workbook->add_format(border => 1, bold => 1, bg_color => '#ccffdd'), optional => $workbook->add_format(border => 1, bold => 1, bg_color => '#eeffee'), - description => workbook->add_format(italic => 1, text_wrap => 1, align => 'left', align => 'vcenter'), + description => $workbook->add_format(italic => 1, text_wrap => 1, align => 'left', align => 'vcenter'), ); # Re-use the structure used to output select2 options in import_file_select_format.pl @@ -67,8 +67,10 @@ my $headers_row = 0; my $description_row = 1; -my $col = 0; +my $col = 1; +my $field_id; +my $comment; $worksheet->set_column('A:A', 30); $worksheet->write( $description_row, 0, "Description", $formats{'description'}); @@ -190,7 +192,7 @@ $worksheet->set_column($col, $col, $width); if ($comment ne "") { - $worksheet->write_comment($description_row, $col, $comment, $formats{'description'}); + $worksheet->write($description_row, $col, $comment, $formats{'description'}); } $col++; From 1873b7d7fbf552a0e8ef18d6449fedce9123e8d4 Mon Sep 17 00:00:00 2001 From: anaritadauane Date: Fri, 15 Mar 2024 16:03:30 +0200 Subject: [PATCH 4/7] made Description a translatable string --- cgi/generate_sample_import_file.pl | 13 ++++++++----- po/common/common.pot | 4 ++++ po/common/es.po | 4 ++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/cgi/generate_sample_import_file.pl b/cgi/generate_sample_import_file.pl index 2e92e540880f2..fd8236b149d4f 100755 --- a/cgi/generate_sample_import_file.pl +++ b/cgi/generate_sample_import_file.pl @@ -56,10 +56,10 @@ my $worksheet = $workbook->add_worksheet(); my %formats = ( normal => $workbook->add_format(border => 1, bold => 1), - mandatory => $workbook->add_format(border => 1, bold => 1, bg_color => '#aaffcc'), - recommended => $workbook->add_format(border => 1, bold => 1, bg_color => '#ccffdd'), - optional => $workbook->add_format(border => 1, bold => 1, bg_color => '#eeffee'), - description => $workbook->add_format(italic => 1, text_wrap => 1, align => 'left', align => 'vcenter'), + mandatory => $workbook->add_format(border => 1, bold => 1, bg_color => '#0f55cc', color => 'white', valign => 'vcenter', align=>'center'), + recommended => $workbook->add_format(border => 1, bold => 1, bg_color => '#1f6ced',color => 'white', valign => 'vcenter', align=>'center'), + optional => $workbook->add_format(border => 1, bold => 1, bg_color => '#4d89f1', color => 'white', valign => 'vcenter', align=>'center'), + description => $workbook->add_format(italic => 1, text_wrap => 1, valign => 'vcenter'), ); # Re-use the structure used to output select2 options in import_file_select_format.pl @@ -69,11 +69,14 @@ my $description_row = 1; my $col = 1; +my $description = lang("description"); my $field_id; my $comment; +$worksheet->set_row(0, 70); +$worksheet->set_column('A:ZZ', 30); $worksheet->set_column('A:A', 30); -$worksheet->write( $description_row, 0, "Description", $formats{'description'}); +$worksheet->write( $description_row, 0, $description , $formats{'description'}); foreach my $group_ref (@$select2_options_ref) { my $group_start_col = $col; diff --git a/po/common/common.pot b/po/common/common.pot index 1e99817b1603d..654eb3b3793d5 100644 --- a/po/common/common.pot +++ b/po/common/common.pot @@ -6845,3 +6845,7 @@ msgstr "" msgctxt "sweetener" msgid "sweetener" msgstr "" + +msgctxt "description" +msgid "Description" +msgstr "Description" diff --git a/po/common/es.po b/po/common/es.po index 1c7b59d2d66b9..34aa788357bf3 100644 --- a/po/common/es.po +++ b/po/common/es.po @@ -489,6 +489,10 @@ msgctxt "delete_confirmation" msgid "This will delete your user details and anonymise all of your contributions. Please re-enter your user name to confirm." msgstr "Esto eliminará sus datos de usuario y anonimizará todas sus contribuciones. Vuelva a ingresar su nombre de usuario para confirmar." +msgctxt "description" +msgid "Descripton" +msgstr "Descripción" + msgctxt "danger_zone" msgid "Danger Zone" msgstr "Zona peligrosa" From b37c4fd940eefeef0e1fe95869badf41df1bbaa6 Mon Sep 17 00:00:00 2001 From: anaritadauane Date: Fri, 15 Mar 2024 16:15:37 +0200 Subject: [PATCH 5/7] added a description string in the en.po file --- po/common/en.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/po/common/en.po b/po/common/en.po index c12a506ae655f..aaa7222e55bd5 100644 --- a/po/common/en.po +++ b/po/common/en.po @@ -6864,3 +6864,7 @@ msgstr "sweeteners" msgctxt "sweetener" msgid "sweetener" msgstr "sweetener" + +msgctxt "description" +msgid "Description" +msgstr "Description" \ No newline at end of file From 0615e88dad23caf14ea271b27fdc9706a45a03fb Mon Sep 17 00:00:00 2001 From: anaritadauane Date: Fri, 15 Mar 2024 16:18:17 +0200 Subject: [PATCH 6/7] fixed the typo in es.po file --- po/common/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/common/es.po b/po/common/es.po index 34aa788357bf3..0b87bd5d967e8 100644 --- a/po/common/es.po +++ b/po/common/es.po @@ -490,7 +490,7 @@ msgid "This will delete your user details and anonymise all of your contribution msgstr "Esto eliminará sus datos de usuario y anonimizará todas sus contribuciones. Vuelva a ingresar su nombre de usuario para confirmar." msgctxt "description" -msgid "Descripton" +msgid "Description" msgstr "Descripción" msgctxt "danger_zone" From ae2dd05d449ecd7a66b98714d87840203d70b2db Mon Sep 17 00:00:00 2001 From: anaritadauane Date: Fri, 15 Mar 2024 16:52:36 +0200 Subject: [PATCH 7/7] fixed the formatting --- cgi/generate_sample_import_file.pl | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/cgi/generate_sample_import_file.pl b/cgi/generate_sample_import_file.pl index fd8236b149d4f..de2c2a8f533b2 100755 --- a/cgi/generate_sample_import_file.pl +++ b/cgi/generate_sample_import_file.pl @@ -56,9 +56,30 @@ my $worksheet = $workbook->add_worksheet(); my %formats = ( normal => $workbook->add_format(border => 1, bold => 1), - mandatory => $workbook->add_format(border => 1, bold => 1, bg_color => '#0f55cc', color => 'white', valign => 'vcenter', align=>'center'), - recommended => $workbook->add_format(border => 1, bold => 1, bg_color => '#1f6ced',color => 'white', valign => 'vcenter', align=>'center'), - optional => $workbook->add_format(border => 1, bold => 1, bg_color => '#4d89f1', color => 'white', valign => 'vcenter', align=>'center'), + mandatory => $workbook->add_format( + border => 1, + bold => 1, + bg_color => '#0f55cc', + color => 'white', + valign => 'vcenter', + align => 'center' + ), + recommended => $workbook->add_format( + border => 1, + bold => 1, + bg_color => '#1f6ced', + color => 'white', + valign => 'vcenter', + align => 'center' + ), + optional => $workbook->add_format( + border => 1, + bold => 1, + bg_color => '#4d89f1', + color => 'white', + valign => 'vcenter', + align => 'center' + ), description => $workbook->add_format(italic => 1, text_wrap => 1, valign => 'vcenter'), ); @@ -76,7 +97,7 @@ $worksheet->set_row(0, 70); $worksheet->set_column('A:ZZ', 30); $worksheet->set_column('A:A', 30); -$worksheet->write( $description_row, 0, $description , $formats{'description'}); +$worksheet->write($description_row, 0, $description, $formats{'description'}); foreach my $group_ref (@$select2_options_ref) { my $group_start_col = $col;