Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deploy to staging #6034

Merged
merged 64 commits into from
Sep 29, 2024
Merged
Show file tree
Hide file tree
Changes from 53 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
e525555
voters deny access when camp is null
usu Sep 27, 2024
623e6b7
checklist.isPrototype migration
pmattmann Sep 12, 2024
2eb2c77
PrototypeChecklist implementation
pmattmann Sep 12, 2024
5e504a2
proposal for Link-Validation
pmattmann Sep 18, 2024
e3391fc
review fixes
pmattmann Sep 27, 2024
9c389b0
fix unittest
pmattmann Sep 27, 2024
c3ab369
Merge pull request #6010 from usu/chore/voter-camp-null
pmattmann Sep 27, 2024
f9c4e25
fix checklist security
pmattmann Sep 28, 2024
6886735
Merge pull request #5930 from pmattmann/feature/prototype-checklist
usu Sep 28, 2024
448f96c
create checklist can select prototype-checklist
pmattmann Sep 28, 2024
80b2b1f
add pbs-checklist (basis, aufbau, wolf, pfadi)
pmattmann Sep 28, 2024
b776414
fix eslint error
pmattmann Sep 28, 2024
d97ee03
add pbs-checklist (basis, aufbau, wolf, pfadi)
pmattmann Sep 28, 2024
e74629b
fix Checklist.IsPrototype migration
pmattmann Sep 28, 2024
6fae7ea
Merge pull request #6014 from pmattmann/feature/create-checklist-from…
usu Sep 28, 2024
ebd4aa4
Merge pull request #6017 from pmattmann/feature/fix-checklist-migration
usu Sep 28, 2024
7a6583e
make checklistitem_checklistid_parentid_position_unique deferrable
pmattmann Sep 28, 2024
2cf168d
fix some text-typos
pmattmann Sep 28, 2024
e4555ed
zero-based positioning
pmattmann Sep 28, 2024
b913c71
refactor folder structure in router views
usu Sep 28, 2024
f664a0b
fix translation keys
usu Sep 28, 2024
434b124
add admin view for Checklists
usu Sep 28, 2024
fa04d11
add admin navigation
usu Sep 28, 2024
8acdf2d
checklist item maximal nesting of 3
pmattmann Sep 28, 2024
a078468
abstract logic into separate components
usu Sep 28, 2024
eed0fed
Merge pull request #6019 from pmattmann/bugfix/reorder-checklist-items
usu Sep 28, 2024
61c268f
fix phpstan
usu Sep 28, 2024
26caec8
Adapt foreign key constraint
simfeld Sep 28, 2024
1bb85dc
Add validations to Checklist and ChecklistItem to match foreign key c…
simfeld Sep 28, 2024
e722819
Add tests
simfeld Sep 28, 2024
51e1265
Update api/src/Entity/ChecklistItem.php
pmattmann Sep 28, 2024
d216bc0
initial draft for printing activity list
usu Sep 28, 2024
1cdc1a6
dev-data: add course with CheckLists and Learning(Objectives,Topics)
BacLuc Sep 28, 2024
025cca1
Merge pull request #6022 from pmattmann/feature/checklistitem-nesting…
usu Sep 28, 2024
c6cd7d8
Merge pull request #6015 from pmattmann/feature/insert-prototype-chec…
pmattmann Sep 28, 2024
2d74dd4
Merge pull request #6024 from simfeld/feature/prevent-checklist-deletion
pmattmann Sep 28, 2024
999ccf2
enable access to /debug without admin user
usu Sep 28, 2024
46730b5
various minor corrections as per review
usu Sep 28, 2024
bc1f39f
Merge pull request #6025 from BacLuc/add-course-to-dev-data
usu Sep 28, 2024
7dab10a
add missing ChecklistDetail
usu Sep 28, 2024
fe818f0
merge devel
usu Sep 28, 2024
b91075b
Merge pull request #6023 from usu/feat/checklist-admin
manuelmeister Sep 28, 2024
0e5be4d
Adjust course dev-data
manuelmeister Sep 28, 2024
68ef354
flatten list of contentNodes
usu Sep 28, 2024
1d120e3
Use distinct ids
manuelmeister Sep 28, 2024
8bb1f07
add contentType to title if intanceName is overriden
usu Sep 28, 2024
fa82557
Adjust admin page
manuelmeister Sep 28, 2024
9c81306
Adjust admin page
manuelmeister Sep 28, 2024
605ed33
implement printing of Checklist ContentNodes
usu Sep 28, 2024
21e38af
Merge pull request #6028 from manuelmeister/bugfix/adjust-course-devdata
pmattmann Sep 28, 2024
a49ab4a
Delete dangling code
manuelmeister Sep 28, 2024
f729c09
fix lodash imports
usu Sep 28, 2024
568c889
Merge pull request #6029 from manuelmeister/feature/admin-ui-adjustment
manuelmeister Sep 28, 2024
6a8af1f
fix data loading for single activity print
usu Sep 28, 2024
7ff0dba
Merge remote-tracking branch 'ecamp/devel' into feat/activity-list
usu Sep 29, 2024
3384462
e2e: print first camp with motto in nuxtPrint.cy.js
BacLuc Sep 29, 2024
2d5c908
dev-data: add 'J+S Kurs' camp prototype
BacLuc Sep 28, 2024
2d9f109
add checklist numbers and sort according to numbers
usu Sep 29, 2024
8934f20
Merge pull request #6030 from BacLuc/dev-course-prototype
pmattmann Sep 29, 2024
218d310
revert react-pdf to v3
usu Sep 29, 2024
b2a175a
improve rendering of checklist elements
usu Sep 29, 2024
c940e55
add tests for config repair
usu Sep 29, 2024
5eb64f1
Merge pull request #6039 from usu/fix/revert-reactpdf-upgrade
usu Sep 29, 2024
582d0a2
Merge pull request #6031 from usu/feat/activity-list
pmattmann Sep 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/fixtures/checklistItems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ App\Entity\ChecklistItem:
checklist: '@checklist1'
parent: '@checklistItem1_1_2'
text: 'Camp1_List1_Item2_Item3'
checklistItem1_1_2_3_4:
checklist: '@checklist1'
parent: '@checklistItem1_1_2_3'
text: 'Camp1_List1_Item2_Item3_Itme4'
checklistItem2_1_1:
checklist: '@checklist1camp2'
text: 'Camp2_List1_Item1'
Expand Down
4 changes: 4 additions & 0 deletions api/fixtures/checklists.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ App\Entity\Checklist:
checklist1campPrototype:
camp: '@campPrototype'
name: 'J+S Ausbildungsziele'
checklistPrototype:
camp: null
isPrototype: true
name: 'J+S Ausbildungsziele'
8 changes: 0 additions & 8 deletions api/migrations/dev-data/Version202406211251.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ public function getDescription(): string {

public function up(Schema $schema): void {
// START PHP CODE
$this->addSql(createTruncateDatabaseCommand());

$statements = getStatementsForMigrationFile();
foreach ($statements as $statement) {
if (trim($statement)) {
$this->addSql($statement);
}
}
// END PHP CODE
}

Expand Down
23 changes: 23 additions & 0 deletions api/migrations/dev-data/Version202409281917.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

declare(strict_types=1);

namespace DataMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

require_once __DIR__.'/helpers.php';

final class Version202409281917 extends AbstractMigration {
public function getDescription(): string {
return 'Set color & abbreviation to some profiles';
}

public function up(Schema $schema): void {
// START PHP CODE
// END PHP CODE
}

public function down(Schema $schema): void {}
}
23 changes: 23 additions & 0 deletions api/migrations/dev-data/Version202409282323.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

declare(strict_types=1);

namespace DataMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

require_once __DIR__.'/helpers.php';

final class Version202409282323 extends AbstractMigration {
public function getDescription(): string {
return 'Adjust data for some courses';
}

public function up(Schema $schema): void {
// START PHP CODE
// END PHP CODE
}

public function down(Schema $schema): void {}
}
31 changes: 31 additions & 0 deletions api/migrations/dev-data/Version202409282339.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

declare(strict_types=1);

namespace DataMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

require_once __DIR__.'/helpers.php';

final class Version202409282339 extends AbstractMigration {
public function getDescription(): string {
return 'Add J+S course prototype.';
}

public function up(Schema $schema): void {
// START PHP CODE
$this->addSql(createTruncateDatabaseCommand());

$statements = getStatementsForMigrationFile();
foreach ($statements as $statement) {
if (trim($statement)) {
$this->addSql($statement);
}
}
// END PHP CODE
}

public function down(Schema $schema): void {}
}
966 changes: 917 additions & 49 deletions api/migrations/dev-data/data.sql

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions api/migrations/schema/Version20240912183023.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20240912183023 extends AbstractMigration {
public function getDescription(): string {
return 'Checklist.IsPrototype';
}

public function up(Schema $schema): void {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE checklist ADD isPrototype BOOLEAN NOT NULL DEFAULT FALSE');
$this->addSql('ALTER TABLE checklist ALTER campid DROP NOT NULL');
}

public function down(Schema $schema): void {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public');
$this->addSql('ALTER TABLE checklist DROP isPrototype');
$this->addSql('ALTER TABLE checklist ALTER campId SET NOT NULL');
}
}
30 changes: 30 additions & 0 deletions api/migrations/schema/Version20240928090159.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

require_once __DIR__.'/checklists/helpers.php';

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20240928090159 extends AbstractMigration {
public function getDescription(): string {
return 'Insert PBS-Checklist';
}

public function up(Schema $schema): void {
$statements = getStatementsForMigrationFile(__DIR__.'/checklists/pbs-checklist.sql');
foreach ($statements as $statement) {
if (trim($statement)) {
$this->addSql($statement);
}
}
}

public function down(Schema $schema): void {}
}
48 changes: 48 additions & 0 deletions api/migrations/schema/Version20240928105306.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20240928105306 extends AbstractMigration {
public function getDescription(): string {
return 'checklistitem_checklistid_parentid_position_unique deferrable';
}

public function up(Schema $schema): void {
$this->addSql(
<<<'EOF'
drop index checklistitem_checklistid_parentid_position_unique
EOF
);
$this->addSql(
<<<'EOF'
alter table checklist_item
add constraint checklistitem_checklistid_parentid_position_unique
unique (checklistid, parentid, position)
deferrable initially deferred
EOF
);
}

public function down(Schema $schema): void {
$this->addSql(
<<<'EOF'
alter table checklist_item
drop constraint checklistitem_checklistid_parentid_position_unique
EOF
);
$this->addSql(
<<<'EOF'
CREATE UNIQUE INDEX checklistitem_checklistid_parentid_position_unique
ON checklist_item (checklistid, parentid, position)
EOF
);
}
}
30 changes: 30 additions & 0 deletions api/migrations/schema/Version20240928121040.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20240928121040 extends AbstractMigration {
public function getDescription(): string {
return 'restricts deletion of checklists to ensure no checklist nodes references a checklist when deleting';
}

public function up(Schema $schema): void {
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE checklistnode_checklistitem DROP CONSTRAINT FK_5A2B5B318A09A289');
$this->addSql('ALTER TABLE checklistnode_checklistitem ADD CONSTRAINT FK_5A2B5B318A09A289 FOREIGN KEY (checklistitem_id) REFERENCES checklist_item (id) ON DELETE RESTRICT NOT DEFERRABLE INITIALLY IMMEDIATE');
}

public function down(Schema $schema): void {
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE SCHEMA public');
$this->addSql('ALTER TABLE checklistnode_checklistitem DROP CONSTRAINT fk_5a2b5b318a09a289');
$this->addSql('ALTER TABLE checklistnode_checklistitem ADD CONSTRAINT fk_5a2b5b318a09a289 FOREIGN KEY (checklistitem_id) REFERENCES checklist_item (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
}
}
15 changes: 15 additions & 0 deletions api/migrations/schema/checklists/helpers.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

namespace DoctrineMigrations;

use PhpMyAdmin\SqlParser\Parser;
use PhpMyAdmin\SqlParser\Statement;

function getStatementsForMigrationFile(string $sqlFile): array {
$sql = file_get_contents($sqlFile);

$parser = new Parser($sql);
$parsed_statements = array_map(fn (Statement $statement) => $statement->build(), $parser->statements);

return str_replace('`', '"', $parsed_statements);
}
Loading
Loading