From 18694a34cf5400086b14144e589b54831439c9ca Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 3 Mar 2022 16:24:37 +0100 Subject: [PATCH 001/132] logic added to only keep youngest descendant. works for issue, seems not to for action --- .../ChillActivityBundle/Entity/Activity.php | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index 0a344236c..f80d4ab86 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -229,7 +229,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialAction(SocialAction $socialAction): self { - if (!$this->socialActions->contains($socialAction)) { + $descendants = $socialAction->getDescendants(); + $inCollection = false; + + if(null != $descendants) { + foreach ($descendants as $d) { + $inCollection = $this->socialActions->contains($d); + } + } else { + $inCollection = $this->socialActions->contains($socialAction); + } + + if(!$inCollection) { $this->socialActions[] = $socialAction; } @@ -238,7 +249,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialIssue(SocialIssue $socialIssue): self { - if (!$this->socialIssues->contains($socialIssue)) { + $descendants = $socialIssue->getDescendants(); + $inCollection = false; + + if(null != $descendants) { + foreach ($descendants as $d) { + $inCollection = $this->socialIssues->contains($d); + } + } else { + $inCollection = $this->socialIssues->contains($socialIssue); + } + + if(!$inCollection) { $this->socialIssues[] = $socialIssue; } From 214ef09fe72e6971de5609b94bd60cb389581f38 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 3 Mar 2022 16:29:35 +0100 Subject: [PATCH 002/132] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a38f2ea47..efd8189bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ and this project adheres to * [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue) * [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474) * [template] do not list inactive templates (for doc generator) - +* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471) ## Test releases ### test release 2022-02-21 From 7c043e9d85257c0e8104f8a026fee30b43a5735a Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 4 Mar 2022 12:06:53 +0100 Subject: [PATCH 003/132] fix logic in activity entity --- .../ChillActivityBundle/Entity/Activity.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index f80d4ab86..034e6073c 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -230,18 +230,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialAction(SocialAction $socialAction): self { $descendants = $socialAction->getDescendants(); - $inCollection = false; - if(null != $descendants) { + if(count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialActions->contains($d); + if ($inCollection) { + return $this; + } } } else { - $inCollection = $this->socialActions->contains($socialAction); - } - - if(!$inCollection) { - $this->socialActions[] = $socialAction; + if (!$this->socialActions->contains($socialAction)) { + $this->socialActions[] = $socialAction; + }; } return $this; @@ -250,18 +250,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialIssue(SocialIssue $socialIssue): self { $descendants = $socialIssue->getDescendants(); - $inCollection = false; - if(null != $descendants) { + if(count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialIssues->contains($d); + if ($inCollection) { + return $this; + } } } else { - $inCollection = $this->socialIssues->contains($socialIssue); - } - - if(!$inCollection) { - $this->socialIssues[] = $socialIssue; + if (!$this->socialIssues->contains($socialIssue)) { + $this->socialIssues[] = $socialIssue; + }; } return $this; From 0333e79b0ae1d3636720f595691b994b31c101a2 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 4 Mar 2022 12:07:29 +0100 Subject: [PATCH 004/132] csfixes --- src/Bundle/ChillActivityBundle/Entity/Activity.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index 034e6073c..f183ced60 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -35,6 +35,7 @@ use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Serializer\Annotation\DiscriminatorMap; use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Serializer\Annotation\SerializedName; +use function count; /** * Class Activity. @@ -231,9 +232,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac { $descendants = $socialAction->getDescendants(); - if(count($descendants) > 0) { + if (count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialActions->contains($d); + if ($inCollection) { return $this; } @@ -241,7 +243,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac } else { if (!$this->socialActions->contains($socialAction)) { $this->socialActions[] = $socialAction; - }; + } } return $this; @@ -251,9 +253,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac { $descendants = $socialIssue->getDescendants(); - if(count($descendants) > 0) { + if (count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialIssues->contains($d); + if ($inCollection) { return $this; } @@ -261,7 +264,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac } else { if (!$this->socialIssues->contains($socialIssue)) { $this->socialIssues[] = $socialIssue; - }; + } } return $this; From 474fffcbb5b4dd63a8866feb46c1532c7a51fe93 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 4 Mar 2022 12:08:00 +0100 Subject: [PATCH 005/132] changelog updated --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efd8189bc..55cc51fde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ and this project adheres to * [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue) * [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474) * [template] do not list inactive templates (for doc generator) -* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471) +* [activity] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471) ## Test releases ### test release 2022-02-21 From 4ef22748033610a69325c826c119c32675d6039b Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 3 Mar 2022 16:24:37 +0100 Subject: [PATCH 006/132] logic added to only keep youngest descendant. works for issue, seems not to for action --- .../ChillActivityBundle/Entity/Activity.php | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index 0a344236c..f80d4ab86 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -229,7 +229,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialAction(SocialAction $socialAction): self { - if (!$this->socialActions->contains($socialAction)) { + $descendants = $socialAction->getDescendants(); + $inCollection = false; + + if(null != $descendants) { + foreach ($descendants as $d) { + $inCollection = $this->socialActions->contains($d); + } + } else { + $inCollection = $this->socialActions->contains($socialAction); + } + + if(!$inCollection) { $this->socialActions[] = $socialAction; } @@ -238,7 +249,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialIssue(SocialIssue $socialIssue): self { - if (!$this->socialIssues->contains($socialIssue)) { + $descendants = $socialIssue->getDescendants(); + $inCollection = false; + + if(null != $descendants) { + foreach ($descendants as $d) { + $inCollection = $this->socialIssues->contains($d); + } + } else { + $inCollection = $this->socialIssues->contains($socialIssue); + } + + if(!$inCollection) { $this->socialIssues[] = $socialIssue; } From b6e530fec6cd84ac44edd1897a0d594ec1e2b44b Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 3 Mar 2022 16:29:35 +0100 Subject: [PATCH 007/132] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 380cc6afe..926363314 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ and this project adheres to * [template] do not list inactive templates (for doc generator) * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490) +* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471) ## Test releases ### test release 2022-02-21 From 25fe105590299fc02e79618095b6fc65c9b27d54 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 4 Mar 2022 12:06:53 +0100 Subject: [PATCH 008/132] fix logic in activity entity --- .../ChillActivityBundle/Entity/Activity.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index f80d4ab86..034e6073c 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -230,18 +230,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialAction(SocialAction $socialAction): self { $descendants = $socialAction->getDescendants(); - $inCollection = false; - if(null != $descendants) { + if(count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialActions->contains($d); + if ($inCollection) { + return $this; + } } } else { - $inCollection = $this->socialActions->contains($socialAction); - } - - if(!$inCollection) { - $this->socialActions[] = $socialAction; + if (!$this->socialActions->contains($socialAction)) { + $this->socialActions[] = $socialAction; + }; } return $this; @@ -250,18 +250,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialIssue(SocialIssue $socialIssue): self { $descendants = $socialIssue->getDescendants(); - $inCollection = false; - if(null != $descendants) { + if(count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialIssues->contains($d); + if ($inCollection) { + return $this; + } } } else { - $inCollection = $this->socialIssues->contains($socialIssue); - } - - if(!$inCollection) { - $this->socialIssues[] = $socialIssue; + if (!$this->socialIssues->contains($socialIssue)) { + $this->socialIssues[] = $socialIssue; + }; } return $this; From 1c21b8070365ca9cb3163104b12bf12c3089a82c Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 4 Mar 2022 12:07:29 +0100 Subject: [PATCH 009/132] csfixes --- src/Bundle/ChillActivityBundle/Entity/Activity.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index 034e6073c..f183ced60 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -35,6 +35,7 @@ use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Serializer\Annotation\DiscriminatorMap; use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Serializer\Annotation\SerializedName; +use function count; /** * Class Activity. @@ -231,9 +232,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac { $descendants = $socialAction->getDescendants(); - if(count($descendants) > 0) { + if (count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialActions->contains($d); + if ($inCollection) { return $this; } @@ -241,7 +243,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac } else { if (!$this->socialActions->contains($socialAction)) { $this->socialActions[] = $socialAction; - }; + } } return $this; @@ -251,9 +253,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac { $descendants = $socialIssue->getDescendants(); - if(count($descendants) > 0) { + if (count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialIssues->contains($d); + if ($inCollection) { return $this; } @@ -261,7 +264,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac } else { if (!$this->socialIssues->contains($socialIssue)) { $this->socialIssues[] = $socialIssue; - }; + } } return $this; From 2012df512cba695ade191a6df4643e3266d8fb83 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 4 Mar 2022 17:27:26 +0100 Subject: [PATCH 010/132] merge conflict fixed --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 926363314..caf897a68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,8 +29,7 @@ and this project adheres to * [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474) * [template] do not list inactive templates (for doc generator) * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490) - -* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471) +* [activity] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471) ## Test releases ### test release 2022-02-21 From 16be28681ad0d7a017803b5668a23466e0c2f015 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Mon, 7 Mar 2022 14:53:54 +0100 Subject: [PATCH 011/132] Test added for activity-social action and social issue --- .../Tests/Entity/ActivityTest.php | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php diff --git a/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php new file mode 100644 index 000000000..c67c99894 --- /dev/null +++ b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php @@ -0,0 +1,98 @@ +addChild($child); + $grandChild = new SocialAction(); + $child->addChild($grandChild); + + $activity = new Activity(); + + $activity->addSocialAction($parent); + + $this->assertCount(1, $activity->getSocialActions()); + $this->assertContains($parent, $activity->getSocialActions()); + + $activity->addSocialAction($grandChild); + + $this->assertCount(1, $activity->getSocialActions()); + $this->assertContains($grandChild, $activity->getSocialActions()); + $this->assertNotContains($parent, $activity->getSocialActions()); + + $activity->addSocialAction($child); + + $this->assertCount(1, $activity->getSocialActions()); + $this->assertContains($grandChild, $activity->getSocialActions()); + $this->assertNotContains($parent, $activity->getSocialActions()); + $this->assertNotContains($child, $activity->getSocialActions()); + + $activity->addSocialAction($another = new SocialAction()); + + $this->assertCount(2, $activity->getSocialActions()); + $this->assertContains($grandChild, $activity->getSocialActions()); + $this->assertContains($another, $activity->getSocialActions()); + $this->assertNotContains($parent, $activity->getSocialActions()); + $this->assertNotContains($child, $activity->getSocialActions()); + } + + public function testHierarchySocialIssues(): void + { + $parent = new SocialIssue(); + $child = new SocialIssue(); + + $parent->addChild($child); + $grandChild = new SocialIssue(); + $child->addChild($grandChild); + + $activity = new Activity(); + + $activity->addSocialIssue($parent); + + $this->assertCount(1, $activity->getSocialIssues()); + $this->assertContains($parent, $activity->getSocialIssues()); + + $activity->addSocialIssue($grandChild); + + $this->assertCount(1, $activity->getSocialIssues()); + $this->assertContains($grandChild, $activity->getSocialIssues()); + $this->assertNotContains($parent, $activity->getSocialIssues()); + + $activity->addSocialIssue($child); + + $this->assertCount(1, $activity->getSocialIssues()); + $this->assertContains($grandChild, $activity->getSocialIssues()); + $this->assertNotContains($parent, $activity->getSocialIssues()); + $this->assertNotContains($child, $activity->getSocialIssues()); + + $activity->addSocialIssue($another = new SocialIssue()); + + $this->assertCount(2, $activity->getSocialIssues()); + $this->assertContains($grandChild, $activity->getSocialIssues()); + $this->assertContains($another, $activity->getSocialIssues()); + $this->assertNotContains($parent, $activity->getSocialIssues()); + $this->assertNotContains($child, $activity->getSocialIssues()); + } + +} \ No newline at end of file From 325ab0daf3832427e52e312261f7315c92096c27 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 8 Mar 2022 15:48:26 +0100 Subject: [PATCH 012/132] chore: Update `composer.json` files. --- composer.json | 6 ++++-- src/Bundle/ChillDocGeneratorBundle/composer.json | 1 + src/Bundle/ChillDocStoreBundle/composer.json | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c96738df8..d0fc51c0e 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "knplabs/knp-time-bundle": "^1.12", "league/csv": "^9.7.1", "nyholm/psr7": "^1.4", - "ocramius/package-versions": "^1.10", + "ocramius/package-versions": "^1.10 || ^2", "odolbeau/phone-number-bundle": "^3.6", "phpoffice/phpspreadsheet": "^1.16", "ramsey/uuid-doctrine": "^1.7", @@ -33,6 +33,7 @@ "symfony/expression-language": "^4.4", "symfony/form": "^4.4", "symfony/framework-bundle": "^4.4", + "symfony/http-foundation": "^4.4", "symfony/intl": "^4.4", "symfony/mailer": "^5.4", "symfony/mime": "^5.4", @@ -103,7 +104,8 @@ "ergebnis/composer-normalize": true, "ocramius/package-versions": true, "phpro/grumphp": true, - "phpstan/extension-installer": true + "phpstan/extension-installer": true, + "roave/you-are-using-it-wrong": true }, "bin-dir": "bin", "optimize-autoloader": true, diff --git a/src/Bundle/ChillDocGeneratorBundle/composer.json b/src/Bundle/ChillDocGeneratorBundle/composer.json index 4ae119636..42939bd2b 100644 --- a/src/Bundle/ChillDocGeneratorBundle/composer.json +++ b/src/Bundle/ChillDocGeneratorBundle/composer.json @@ -18,6 +18,7 @@ } ], "require": { + "spomky-labs/base64url": "^2" }, "require-dev": { }, diff --git a/src/Bundle/ChillDocStoreBundle/composer.json b/src/Bundle/ChillDocStoreBundle/composer.json index c011ce29b..aa636535e 100644 --- a/src/Bundle/ChillDocStoreBundle/composer.json +++ b/src/Bundle/ChillDocStoreBundle/composer.json @@ -8,7 +8,8 @@ } }, "require": { - "symfony/mime": "^4 || ^5" + "symfony/mime": "^4 || ^5", + "symfony/http-foundation": "^4" }, "license": "AGPL-3.0" } From 6ddbf35a7b334e0e6745e03e0984c4b088ee0908 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 8 Mar 2022 15:46:50 +0100 Subject: [PATCH 013/132] misc: Add return types. --- src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php index c512dba73..d5afd4a28 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php @@ -109,12 +109,12 @@ class StoredObject implements AsyncFileInterface, Document return $this->id; } - public function getIv() + public function getIv(): array { return $this->iv; } - public function getKeyInfos() + public function getKeyInfos(): array { return $this->keyInfos; } @@ -163,21 +163,21 @@ class StoredObject implements AsyncFileInterface, Document return $this; } - public function setIv($iv) + public function setIv(array $iv) { $this->iv = $iv; return $this; } - public function setKeyInfos($keyInfos) + public function setKeyInfos(array $keyInfos) { $this->keyInfos = $keyInfos; return $this; } - public function setType($type) + public function setType(string $type) { $this->type = $type; From b8992b8eeba281559cf9b226c10d194a54bd92d9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 8 Mar 2022 15:47:33 +0100 Subject: [PATCH 014/132] misc: Update interface doc. --- .../Context/ContextManager.php | 5 +--- .../Context/ContextManagerInterface.php | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php index 8dfecb730..b8f4d0eed 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php +++ b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManager.php @@ -14,7 +14,7 @@ namespace Chill\DocGeneratorBundle\Context; use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException; use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate; -class ContextManager +final class ContextManager implements ContextManagerInterface { /** * @var DocGeneratorContextInterface[]|iterable @@ -26,9 +26,6 @@ class ContextManager $this->contexts = $contexts; } - /** - * @throw ContextNotFoundException when the context is not found - */ public function getContextByDocGeneratorTemplate(DocGeneratorTemplate $docGeneratorTemplate): DocGeneratorContextInterface { foreach ($this->contexts as $key => $context) { diff --git a/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php new file mode 100644 index 000000000..3468d787d --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Context/ContextManagerInterface.php @@ -0,0 +1,30 @@ + Date: Tue, 8 Mar 2022 15:46:31 +0100 Subject: [PATCH 015/132] refactor: Return a string instead of a resource. --- .../GeneratorDriver/DriverInterface.php | 7 +-- .../GeneratorDriver/RelatorioDriver.php | 46 +++++++++++++------ 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php index 2572484e1..d787523c9 100644 --- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php +++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/DriverInterface.php @@ -13,10 +13,5 @@ namespace Chill\DocGeneratorBundle\GeneratorDriver; interface DriverInterface { - /** - * @param resource $template - * - * @return resource - */ - public function generateFromResource($template, string $resourceType, array $data, ?string $templateName = null); + public function generateFromString(string $template, string $resourceType, array $data, ?string $templateName = null): string; } diff --git a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php index 7a3e4ac69..73a4ba9e0 100644 --- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php +++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php @@ -20,40 +20,40 @@ use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface; use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface; use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface; use Symfony\Contracts\HttpClient\HttpClientInterface; +use Throwable; -class RelatorioDriver implements DriverInterface +final class RelatorioDriver implements DriverInterface { - private LoggerInterface $logger; + private HttpClientInterface $client; - private HttpClientInterface $relatorioClient; + private LoggerInterface $logger; private string $url; public function __construct( - HttpClientInterface $relatorioClient, + HttpClientInterface $client, ParameterBagInterface $parameterBag, LoggerInterface $logger ) { - $this->relatorioClient = $relatorioClient; + $this->client = $client; $this->logger = $logger; $this->url = $parameterBag->get('chill_doc_generator')['driver']['relatorio']['url']; } - public function generateFromResource($template, string $resourceType, array $data, ?string $templateName = null) + public function generateFromString(string $template, string $resourceType, array $data, ?string $templateName = null): string { - $formFields = [ - 'variables' => json_encode($data), - 'template' => new DataPart($template, $templateName ?? uniqid('template_'), $resourceType), - ]; - $form = new FormDataPart($formFields); + $form = new FormDataPart( + [ + 'variables' => json_encode($data), + 'template' => new DataPart($template, $templateName ?? uniqid('template_'), $resourceType), + ] + ); try { - $response = $this->relatorioClient->request('POST', $this->url, [ + $response = $this->client->request('POST', $this->url, [ 'headers' => $form->getPreparedHeaders()->toArray(), 'body' => $form->bodyToIterable(), ]); - - return $response->toStream(); } catch (HttpExceptionInterface $e) { $content = $e->getResponse()->getContent(false); @@ -88,5 +88,23 @@ class RelatorioDriver implements DriverInterface throw $e; } + + try { + $content = $response->getContent(); + } catch (Throwable $exception) { + $this + ->logger + ->error( + 'relatorio: Unable to get content from response.', + [ + 'msg' => $exception->getMessage(), + 'e' => $exception->getTraceAsString(), + ] + ); + + throw $exception; + } + + return $content; } } From 62af980ea545dbcfa018ee793d8d515d1e45cb88 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 8 Mar 2022 15:45:39 +0100 Subject: [PATCH 016/132] feat: Add new `StoredObjectManager` service. To read and write onto `StoredObject` document using a common interface. --- .../StoredObjectManagerException.php | 40 ++++ .../Service/StoredObjectManager.php | 133 +++++++++++++ .../Service/StoredObjectManagerInterface.php | 34 ++++ .../Tests/StoredObjectManagerTest.php | 183 ++++++++++++++++++ 4 files changed, 390 insertions(+) create mode 100644 src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php create mode 100644 src/Bundle/ChillDocStoreBundle/Service/StoredObjectManager.php create mode 100644 src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php create mode 100644 src/Bundle/ChillDocStoreBundle/Tests/StoredObjectManagerTest.php diff --git a/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php b/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php new file mode 100644 index 000000000..b5d0bf679 --- /dev/null +++ b/src/Bundle/ChillDocStoreBundle/Exception/StoredObjectManagerException.php @@ -0,0 +1,40 @@ +client = $client; + $this->tempUrlGenerator = $tempUrlGenerator; + } + + public function read(StoredObject $document): string + { + try { + $response = $this + ->client + ->request( + Request::METHOD_GET, + $this + ->tempUrlGenerator + ->generate( + Request::METHOD_GET, + $document->getFilename() + ) + ->url + ); + } catch (Throwable $e) { + throw StoredObjectManagerException::errorDuringHttpRequest($e); + } + + if ($response->getStatusCode() !== Response::HTTP_OK) { + throw StoredObjectManagerException::invalidStatusCode($response->getStatusCode()); + } + + try { + $data = $response->getContent(); + } catch (Throwable $e) { + throw StoredObjectManagerException::unableToGetResponseContent($e); + } + + if (false === $this->hasKeysAndIv($document)) { + return $data; + } + + $clearData = openssl_decrypt( + $data, + self::ALGORITHM, + // TODO: Why using this library and not use base64_decode() ? + Base64Url::decode($document->getKeyInfos()['k']), + OPENSSL_RAW_DATA, + pack('C*', ...$document->getIv()) + ); + + if (false === $clearData) { + throw StoredObjectManagerException::unableToDecrypt(openssl_error_string()); + } + + return $clearData; + } + + public function write(StoredObject $document, string $clearContent): void + { + $encryptedContent = $this->hasKeysAndIv($document) + ? openssl_encrypt( + $clearContent, + self::ALGORITHM, + // TODO: Why using this library and not use base64_decode() ? + Base64Url::decode($document->getKeyInfos()['k']), + OPENSSL_RAW_DATA, + pack('C*', ...$document->getIv()) + ) + : $clearContent; + + try { + $response = $this + ->client + ->request( + Request::METHOD_PUT, + $this + ->tempUrlGenerator + ->generate( + Request::METHOD_PUT, + $document->getFilename() + ) + ->url, + [ + 'body' => $encryptedContent, + ] + ); + } catch (TransportExceptionInterface $exception) { + throw StoredObjectManagerException::errorDuringHttpRequest($exception); + } + + if ($response->getStatusCode() !== Response::HTTP_CREATED) { + throw StoredObjectManagerException::invalidStatusCode($response->getStatusCode()); + } + } + + private function hasKeysAndIv(StoredObject $storedObject): bool + { + return ([] !== $storedObject->getKeyInfos()) && ([] !== $storedObject->getIv()); + } +} diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php new file mode 100644 index 000000000..3cf67cb0c --- /dev/null +++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectManagerInterface.php @@ -0,0 +1,34 @@ +setFilename('encrypted.txt') + ->setKeyInfos(['k' => base64_encode('S9NIHMaFHOWzLPez3jZOIHBaNfBrMQUR5zvqBz6kme8')]) + ->setIv(unpack('C*', 'abcdefghijklmnop')), + hex2bin('741237d255fd4f7eddaaa9058912a84caae28a41b10b34d4e3e3abe41d3b9b47cb0dd8f22c3c883d4f0e9defa75ff662'), // Binary encoded string + 'The quick brown fox jumps over the lazy dog', // clear + ]; + + // Non-encrypted object + yield [ + (new StoredObject())->setFilename('non-encrypted.txt'), // The StoredObject + 'The quick brown fox jumps over the lazy dog', // Encrypted + 'The quick brown fox jumps over the lazy dog', // Clear + ]; + + /* UNHAPPY SCENARIO */ + + // Encrypted object with issue during HTTP communication + yield [ + (new StoredObject()) + ->setFilename('error_during_http_request.txt') + ->setKeyInfos(['k' => base64_encode('S9NIHMaFHOWzLPez3jZOIHBaNfBrMQUR5zvqBz6kme8')]) + ->setIv(unpack('C*', 'abcdefghijklmnop')), + hex2bin('741237d255fd4f7eddaaa9058912a84caae28a41b10b34d4e3e3abe41d3b9b47cb0dd8f22c3c883d4f0e9defa75ff662'), // Binary encoded string + 'The quick brown fox jumps over the lazy dog', // clear + StoredObjectManagerException::class, + ]; + + // Encrypted object with issue during HTTP communication: Invalid status code + yield [ + (new StoredObject()) + ->setFilename('invalid_statuscode.txt') + ->setKeyInfos(['k' => base64_encode('S9NIHMaFHOWzLPez3jZOIHBaNfBrMQUR5zvqBz6kme8')]) + ->setIv(unpack('C*', 'abcdefghijklmnop')), + hex2bin('741237d255fd4f7eddaaa9058912a84caae28a41b10b34d4e3e3abe41d3b9b47cb0dd8f22c3c883d4f0e9defa75ff662'), // Binary encoded string + 'The quick brown fox jumps over the lazy dog', // clear + StoredObjectManagerException::class, + ]; + + // Erroneous encrypted: Unable to decrypt exception. + yield [ + (new StoredObject()) + ->setFilename('unable_to_decrypt.txt') + ->setKeyInfos(['k' => base64_encode('WRONG_PASS_PHRASE')]) + ->setIv(unpack('C*', 'abcdefghijklmnop')), + 'WRONG_ENCODED_VALUE', // Binary encoded string + 'The quick brown fox jumps over the lazy dog', // clear + StoredObjectManagerException::class, + ]; + } + + /** + * @dataProvider getDataProvider + */ + public function testRead(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null) + { + if (null !== $exceptionClass) { + $this->expectException($exceptionClass); + } + + $storedObjectManager = $this->getSubject($storedObject, $encodedContent); + + self::assertEquals($clearContent, $storedObjectManager->read($storedObject)); + } + + /** + * @dataProvider getDataProvider + */ + public function testWrite(StoredObject $storedObject, string $encodedContent, string $clearContent, ?string $exceptionClass = null) + { + if (null !== $exceptionClass) { + $this->expectException($exceptionClass); + } + + $storedObjectManager = $this->getSubject($storedObject, $encodedContent); + + $storedObjectManager->write($storedObject, $clearContent); + + self::assertEquals($clearContent, $storedObjectManager->read($storedObject)); + } + + private function getHttpClient(string $encodedContent): HttpClientInterface + { + $callback = static function ($method, $url, $options) use ($encodedContent) { + if (Request::METHOD_GET === $method) { + switch ($url) { + case 'https://example.com/non-encrypted.txt': + case 'https://example.com/encrypted.txt': + return new MockResponse($encodedContent, ['http_code' => 200]); + + case 'https://example.com/error_during_http_request.txt': + return new TransportException('error_during_http_request.txt'); + + case 'https://example.com/invalid_statuscode.txt': + return new MockResponse($encodedContent, ['http_code' => 404]); + } + } + + if (Request::METHOD_PUT === $method) { + switch ($url) { + case 'https://example.com/non-encrypted.txt': + case 'https://example.com/encrypted.txt': + return new MockResponse($encodedContent, ['http_code' => 201]); + + case 'https://example.com/error_during_http_request.txt': + throw new TransportException('error_during_http_request.txt'); + + case 'https://example.com/invalid_statuscode.txt': + return new MockResponse($encodedContent, ['http_code' => 404]); + } + } + + return new MockResponse('Not found'); + }; + + return new MockHttpClient($callback); + } + + private function getSubject(StoredObject $storedObject, string $encodedContent): StoredObjectManagerInterface + { + return new StoredObjectManager( + $this->getHttpClient($encodedContent), + $this->getTempUrlGenerator($storedObject) + ); + } + + private function getTempUrlGenerator(StoredObject $storedObject): TempUrlGeneratorInterface + { + $response = new stdClass(); + $response->url = $storedObject->getFilename(); + + $tempUrlGenerator = $this + ->getMockBuilder(TempUrlGeneratorInterface::class) + ->getMock(); + + $tempUrlGenerator + ->method('generate') + ->withAnyParameters() + ->willReturn($response); + + return $tempUrlGenerator; + } +} From 35d723e5fbc22ea324ce1c174f299c3794ee5d76 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 8 Mar 2022 15:48:52 +0100 Subject: [PATCH 017/132] refactor: Use `StoredObjectManager`. --- .../DocGeneratorTemplateController.php | 206 +++++++++--------- .../src/Service/Wopi/ChillDocumentManager.php | 70 +----- 2 files changed, 113 insertions(+), 163 deletions(-) diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php index 000fcb03a..2f64ea81e 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php @@ -11,8 +11,6 @@ declare(strict_types=1); namespace Chill\DocGeneratorBundle\Controller; -use Base64Url\Base64Url; -use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface; use Chill\DocGeneratorBundle\Context\ContextManager; use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface; use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException; @@ -21,11 +19,11 @@ use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface; use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException; use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository; use Chill\DocStoreBundle\Entity\StoredObject; +use Chill\DocStoreBundle\Service\StoredObjectManagerInterface; use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Serializer\Model\Collection; +use Doctrine\ORM\EntityManagerInterface; use Exception; -use GuzzleHttp\Client; -use GuzzleHttp\Exception\TransferException; use Psr\Log\LoggerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\Extension\Core\Type\FileType; @@ -34,14 +32,14 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; // TODO à mettre dans services use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\HttpKernel\KernelInterface; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; +use Symfony\Component\Serializer\Normalizer\ObjectNormalizer; use Symfony\Contracts\HttpClient\HttpClientInterface; +use Throwable; +use function strlen; final class DocGeneratorTemplateController extends AbstractController { @@ -53,13 +51,13 @@ final class DocGeneratorTemplateController extends AbstractController private DriverInterface $driver; - private KernelInterface $kernel; + private EntityManagerInterface $entityManager; private LoggerInterface $logger; private PaginatorFactory $paginatorFactory; - private TempUrlGeneratorInterface $tempUrlGenerator; + private StoredObjectManagerInterface $storedObjectManager; public function __construct( ContextManager $contextManager, @@ -67,18 +65,18 @@ final class DocGeneratorTemplateController extends AbstractController DriverInterface $driver, LoggerInterface $logger, PaginatorFactory $paginatorFactory, - TempUrlGeneratorInterface $tempUrlGenerator, - KernelInterface $kernel, - HttpClientInterface $client + HttpClientInterface $client, + StoredObjectManagerInterface $storedObjectManager, + EntityManagerInterface $entityManager ) { $this->contextManager = $contextManager; $this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository; $this->driver = $driver; $this->logger = $logger; $this->paginatorFactory = $paginatorFactory; - $this->tempUrlGenerator = $tempUrlGenerator; - $this->kernel = $kernel; $this->client = $client; + $this->storedObjectManager = $storedObjectManager; + $this->entityManager = $entityManager; } /** @@ -177,8 +175,10 @@ final class DocGeneratorTemplateController extends AbstractController return $this->redirectToRoute( 'chill_docgenerator_test_generate_from_template', - ['template' => $template, 'entityClassName' => $entityClassName, 'entityId' => $entityId, - 'returnPath' => $request->query->get('returnPath', '/'), ] + [ + 'template' => $template, 'entityClassName' => $entityClassName, 'entityId' => $entityId, + 'returnPath' => $request->query->get('returnPath', '/'), + ] ); } @@ -192,16 +192,26 @@ final class DocGeneratorTemplateController extends AbstractController try { $context = $this->contextManager->getContextByDocGeneratorTemplate($template); } catch (ContextNotFoundException $e) { - throw new NotFoundHttpException($e->getMessage(), $e); + throw new NotFoundHttpException( + 'Context not found.', + $e + ); } - $entity = $this->getDoctrine()->getRepository($context->getEntityClass())->find($entityId); + $entity = $this + ->entityManager + ->getRepository($context->getEntityClass()) + ->find($entityId); if (null === $entity) { - throw new NotFoundHttpException("Entity with classname {$entityClassName} and id {$entityId} is not found"); + throw new NotFoundHttpException( + sprintf('Entity with classname %s and id %s is not found', $entityClassName, $entityId) + ); } - $contextGenerationData = []; + $contextGenerationData = [ + 'test_file' => null, + ]; if ( $context instanceof DocGeneratorContextWithPublicFormInterface @@ -235,123 +245,109 @@ final class DocGeneratorTemplateController extends AbstractController $contextGenerationData = $form->getData(); } elseif (!$form->isSubmitted() || ($form->isSubmitted() && !$form->isValid())) { $templatePath = '@ChillDocGenerator/Generator/basic_form.html.twig'; - $templateOptions = ['entity' => $entity, 'form' => $form->createView(), - 'template' => $template, 'context' => $context, ]; + $templateOptions = [ + 'entity' => $entity, 'form' => $form->createView(), + 'template' => $template, 'context' => $context, + ]; return $this->render($templatePath, $templateOptions); } } - if ($isTest && null !== $contextGenerationData['test_file']) { - /** @var File $file */ - $file = $contextGenerationData['test_file']; - $templateResource = fopen($file->getPathname(), 'rb'); + $document = $template->getFile(); + + if ($isTest && ($contextGenerationData['test_file'] instanceof File)) { + $dataDecrypted = file_get_contents($contextGenerationData['test_file']->getPathname()); } else { - $getUrlGen = $this->tempUrlGenerator->generate( - 'GET', - $template->getFile()->getFilename() - ); - - $data = $this->client->request('GET', $getUrlGen->url); - - $iv = $template->getFile()->getIv(); // iv as an Array - $ivGoodFormat = pack('C*', ...$iv); // iv as a String (ok for openssl_decrypt) - - $method = 'AES-256-CBC'; - - $key = $template->getFile()->getKeyInfos()['k']; - $keyGoodFormat = Base64Url::decode($key); - - $dataDecrypted = openssl_decrypt($data->getContent(), $method, $keyGoodFormat, 1, $ivGoodFormat); - - if (false === $dataDecrypted) { - throw new Exception('Error during Decrypt ', 1); + try { + $dataDecrypted = $this->storedObjectManager->read($document); + } catch (Throwable $exception) { + throw $exception; } - - if (false === $templateResource = fopen('php://memory', 'r+b')) { - $this->logger->error('Could not write data to memory'); - - throw new HttpException(500); - } - fwrite($templateResource, $dataDecrypted); - rewind($templateResource); } - $datas = $context->getData($template, $entity, $contextGenerationData); try { - $generatedResource = $this->driver->generateFromResource($templateResource, $template->getFile()->getType(), $datas, $template->getFile()->getFilename()); + $generatedResource = $this + ->driver + ->generateFromString( + $dataDecrypted, + $template->getFile()->getType(), + $context->getData($template, $entity, $contextGenerationData), + $template->getFile()->getFilename() + ); } catch (TemplateException $e) { - $msg = implode("\n", $e->getErrors()); - - return new Response($msg, 400, [ - 'Content-Type' => 'text/plain', - ]); + return new Response( + implode("\n", $e->getErrors()), + 400, + [ + 'Content-Type' => 'text/plain', + ] + ); } - fclose($templateResource); - if ($isTest) { - return new StreamedResponse( - static function () use ($generatedResource) { - fpassthru($generatedResource); - fclose($generatedResource); - }, + return new Response( + $generatedResource, Response::HTTP_OK, [ 'Content-Transfer-Encoding', 'binary', 'Content-Type' => 'application/vnd.oasis.opendocument.text', - 'Content-Disposition' => sprintf('attachment; filename="%s.odt"', 'generated'), - 'Content-Length' => fstat($generatedResource)['size'], + 'Content-Disposition' => 'attachment; filename="generated.odt"', + 'Content-Length' => strlen($generatedResource), ], ); } - $genDocName = 'doc_' . sprintf('%010d', mt_rand()) . 'odt'; - - $getUrlGen = $this->tempUrlGenerator->generate( - 'PUT', - $genDocName - ); - - $client = new Client(); + /** @var StoredObject $storedObject */ + $storedObject = (new ObjectNormalizer()) + ->denormalize( + [ + 'type' => $template->getFile()->getType(), + 'filename' => sprintf('%s_odt', uniqid('doc_', true)), + ], + StoredObject::class + ); try { - $putResponse = $client->request('PUT', $getUrlGen->url, [ - 'body' => $generatedResource, - ]); + $this->storedObjectManager->write($storedObject, $generatedResource); + } catch (Throwable $exception) { + throw $exception; + } - if ($putResponse->getStatusCode() === 201) { - $em = $this->getDoctrine()->getManager(); - $storedObject = new StoredObject(); - $storedObject - ->setType($template->getFile()->getType()) - ->setFilename($genDocName); + $this->entityManager->persist($storedObject); - $em->persist($storedObject); - - try { - $context->storeGenerated($template, $storedObject, $entity, $contextGenerationData); - } catch (Exception $e) { - $this->logger->error('Could not store the associated document to entity', [ + try { + $context + ->storeGenerated( + $template, + $storedObject, + $entity, + $contextGenerationData + ); + } catch (Exception $e) { + $this + ->logger + ->error( + 'Unable to store the associated document to entity', + [ 'entityClassName' => $entityClassName, 'entityId' => $entityId, 'contextKey' => $context->getName(), - ]); + ] + ); - throw $e; - } - - $em->flush(); - - return $this->redirectToRoute('chill_wopi_file_edit', [ - 'fileId' => $storedObject->getUuid(), - 'returnPath' => $request->query->get('returnPath', '/'), - ]); - } - } catch (TransferException $e) { throw $e; } - throw new Exception('Unable to generate document.'); + $this->entityManager->flush(); + + return $this + ->redirectToRoute( + 'chill_wopi_file_edit', + [ + 'fileId' => $storedObject->getUuid(), + 'returnPath' => $request->query->get('returnPath', '/'), + ] + ); } } diff --git a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php index 19ff3c62e..7cc71188f 100644 --- a/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php +++ b/src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php @@ -11,12 +11,12 @@ declare(strict_types=1); namespace Chill\WopiBundle\Service\Wopi; -use ChampsLibres\AsyncUploaderBundle\TempUrl\TempUrlGeneratorInterface; use ChampsLibres\WopiLib\Contract\Entity\Document; use ChampsLibres\WopiLib\Contract\Service\DocumentLockManagerInterface; use ChampsLibres\WopiLib\Contract\Service\DocumentManagerInterface; use Chill\DocStoreBundle\Entity\StoredObject; use Chill\DocStoreBundle\Repository\StoredObjectRepository; +use Chill\DocStoreBundle\Service\StoredObjectManagerInterface; use DateTimeInterface; use Doctrine\ORM\EntityManagerInterface; use Error; @@ -28,8 +28,6 @@ use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Mime\MimeTypes; use Symfony\Component\Serializer\Normalizer\ObjectNormalizer; -use Symfony\Contracts\HttpClient\HttpClientInterface; -use Throwable; use function strlen; @@ -39,33 +37,29 @@ final class ChillDocumentManager implements DocumentManagerInterface private EntityManagerInterface $entityManager; - private HttpClientInterface $httpClient; - private Psr17Interface $psr17; private RequestInterface $request; private StoredObjectRepository $storedObjectRepository; - private TempUrlGeneratorInterface $tempUrlGenerator; + private StoredObjectManagerInterface $storedObjectManager; public function __construct( DocumentLockManagerInterface $documentLockManager, EntityManagerInterface $entityManager, - HttpClientInterface $httpClient, - Psr17Interface $psr17, - StoredObjectRepository $storedObjectRepository, - TempUrlGeneratorInterface $tempUrlGenerator, HttpMessageFactoryInterface $httpMessageFactory, - RequestStack $requestStack + Psr17Interface $psr17, + RequestStack $requestStack, + StoredObjectManagerInterface $storedObjectManager, + StoredObjectRepository $storedObjectRepository ) { + $this->documentLockManager = $documentLockManager; $this->entityManager = $entityManager; $this->psr17 = $psr17; - $this->storedObjectRepository = $storedObjectRepository; - $this->documentLockManager = $documentLockManager; - $this->tempUrlGenerator = $tempUrlGenerator; - $this->httpClient = $httpClient; $this->request = $httpMessageFactory->createRequest($requestStack->getCurrentRequest()); + $this->storedObjectManager = $storedObjectManager; + $this->storedObjectRepository = $storedObjectRepository; } public function create(array $data): Document @@ -197,18 +191,7 @@ final class ChillDocumentManager implements DocumentManagerInterface public function remove(Document $document): void { - $entityIsDeleted = false; - - try { - $this->entityManager->remove($document); - $entityIsDeleted = true; - } catch (Throwable $e) { - $entityIsDeleted = false; - } - - if (true === $entityIsDeleted) { - $this->deleteContent($document); - } + // TODO: To implement when we have a clearer view and API. } public function write(Document $document, array $properties = []): void @@ -216,42 +199,13 @@ final class ChillDocumentManager implements DocumentManagerInterface $this->setContent($document, $properties['content']); } - private function deleteContent(StoredObject $storedObject): void - { - /** @var StdClass $object */ - $object = $this->tempUrlGenerator->generate('DELETE', $storedObject->getFilename()); - - $response = $this->httpClient->request('DELETE', $object->url); - - if (200 !== $response->getStatusCode()) { - throw new Error('Unable to delete stored object.'); - } - } - private function getContent(StoredObject $storedObject): string { - /** @var StdClass $object */ - $object = $this->tempUrlGenerator->generate('GET', $storedObject->getFilename()); - - $response = $this->httpClient->request('GET', $object->url); - - if (200 !== $response->getStatusCode()) { - throw new Error('Unable to retrieve stored object.'); - } - - return $response->getContent(); + return $this->storedObjectManager->read($storedObject); } private function setContent(StoredObject $storedObject, string $content): void { - // TODO: Add strict typing in champs-libres/async-uploader-bundle - /** @var StdClass $object */ - $object = $this->tempUrlGenerator->generate('PUT', $storedObject->getFilename()); - - $response = $this->httpClient->request('PUT', $object->url, ['body' => $content]); - - if (201 !== $response->getStatusCode()) { - throw new Error('Unable to save stored object.'); - } + $this->storedObjectManager->write($storedObject, $content); } } From 3d7fcd99a8d5ad3e65f45fb6d583706e16e1aece Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 15 Mar 2022 11:25:19 +0100 Subject: [PATCH 018/132] fix: Remove `console.log`. --- .../ChillWopiBundle/src/Resources/public/page/editor/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js index 613a51d63..bb684e406 100644 --- a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js +++ b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js @@ -18,7 +18,6 @@ window.addEventListener('DOMContentLoaded', function(e) { frameholder.appendChild(office_frame); document.getElementById('office_form').submit(); - console.log(office_frame); const url = new URL(editor_url); const editor_domain = url.origin; From 22755de1dda819aa584bc0c99d43b2b36c23a705 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 15 Mar 2022 13:42:13 +0100 Subject: [PATCH 019/132] fix: Remove `PrependExtensionInterface`. It is now handled by `chill_main` bundle. --- .../DependencyInjection/ChillWopiExtension.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php index 9e8596336..37a9e2fa6 100644 --- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/ChillWopiExtension.php @@ -11,14 +11,12 @@ declare(strict_types=1); namespace Chill\WopiBundle\DependencyInjection; -use Ramsey\Uuid\Doctrine\UuidType; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; use Symfony\Component\DependencyInjection\Loader\PhpFileLoader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; -final class ChillWopiExtension extends Extension implements PrependExtensionInterface +final class ChillWopiExtension extends Extension { public function load(array $configs, ContainerBuilder $container) { @@ -33,18 +31,4 @@ final class ChillWopiExtension extends Extension implements PrependExtensionInte $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); $loader->load('services.php'); } - - public function prepend(ContainerBuilder $container) - { - $container->prependExtensionConfig( - 'doctrine', - [ - 'dbal' => [ - 'types' => [ - 'uuid' => UuidType::class, - ], - ], - ] - ); - } } From 9551e10d2b3d902410ac3369bebf4f630cfb5bf5 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 16 Mar 2022 11:55:19 +0100 Subject: [PATCH 020/132] improvement, but still not correct --- .../ChillActivityBundle/Entity/Activity.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index f183ced60..db16ac9f6 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -235,15 +235,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac if (count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialActions->contains($d); - if ($inCollection) { return $this; } } - } else { - if (!$this->socialActions->contains($socialAction)) { - $this->socialActions[] = $socialAction; - } + } + if (!$this->socialActions->contains($socialAction)) { + $this->socialActions[] = $socialAction; } return $this; @@ -256,15 +254,14 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac if (count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialIssues->contains($d); - if ($inCollection) { return $this; } } - } else { - if (!$this->socialIssues->contains($socialIssue)) { - $this->socialIssues[] = $socialIssue; - } + } + + if (!$this->socialIssues->contains($socialIssue)) { + $this->socialIssues[] = $socialIssue; } return $this; From 02571bf727135cbb305410a046bccee41694c8a3 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 22 Mar 2022 13:45:20 +0100 Subject: [PATCH 021/132] switch to using getDescendantsWithThis() --- src/Bundle/ChillActivityBundle/Entity/Activity.php | 13 +++++-------- .../Entity/SocialWork/SocialAction.php | 2 +- .../Entity/SocialWork/SocialIssue.php | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index db16ac9f6..ac67a73e4 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -230,7 +230,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialAction(SocialAction $socialAction): self { - $descendants = $socialAction->getDescendants(); + $descendants = $socialAction->getDescendantsWithThis(); if (count($descendants) > 0) { foreach ($descendants as $d) { @@ -240,16 +240,14 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac } } } - if (!$this->socialActions->contains($socialAction)) { - $this->socialActions[] = $socialAction; - } + $this->socialActions[] = $socialAction; return $this; } public function addSocialIssue(SocialIssue $socialIssue): self { - $descendants = $socialIssue->getDescendants(); + $descendants = $socialIssue->getDescendantsWithThis(); if (count($descendants) > 0) { foreach ($descendants as $d) { @@ -260,9 +258,8 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac } } - if (!$this->socialIssues->contains($socialIssue)) { - $this->socialIssues[] = $socialIssue; - } + $this->socialIssues[] = $socialIssue; + return $this; } diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php index ec5e5a8e5..01f30f140 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php @@ -169,7 +169,7 @@ class SocialAction } /** - * @return Collection|self[] All the descendants with the current entity (this) + * @return Collection|self[] All the descendants including the current entity (this) */ public function getDescendantsWithThis(): Collection { diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php index c735c0132..fb277f56c 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php @@ -202,7 +202,7 @@ class SocialIssue } /** - * @return Collection|self[] All the descendants with the current entity (this) + * @return Collection|self[] All the descendants including the current entity (this) */ public function getDescendantsWithThis(): Collection { From bcde4497cc435a65dc1fb7a12c90fec77a30a0f5 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 5 Apr 2022 15:56:02 +0200 Subject: [PATCH 022/132] fix datepicker for social action --- .../public/vuejs/AccompanyingCourseWorkCreate/App.vue | 9 ++++----- .../public/vuejs/AccompanyingCourseWorkCreate/store.js | 7 ++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue index 503a00c59..758cd7e5e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue @@ -227,19 +227,18 @@ export default { }, startDate: { get() { - let d = this.$store.state.startDate; - return dateToISO(d); + return this.$store.state.startDate; }, set(value) { - this.$store.commit('setStartDate', ISOToDate(value)); + this.$store.commit('setStartDate', value); } }, endDate: { get() { - return dateToISO(this.$store.state.endDate); + return this.$store.state.endDate; }, set(value) { - this.$store.commit('setEndDate', ISOToDate(value)); + this.$store.commit('setEndDate', value); } }, setSocialIssue: { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js index 408115257..7b6c2b22e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js @@ -1,6 +1,6 @@ import { createStore } from 'vuex'; -import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js'; +import { datetimeToISO, dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js'; import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js'; // import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js'; import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods'; @@ -47,7 +47,7 @@ const store = createStore({ id: state.socialActionPicked.id }, startDate: { - datetime: datetimeToISO(state.startDate) + datetime: datetimeToISO(ISOToDate(state.startDate)) }, persons: [] }; @@ -61,7 +61,7 @@ const store = createStore({ if (null !== state.endDate) { payload.endDate = { - datetime: datetimeToISO(state.endDate) + datetime: datetimeToISO(ISOToDate(state.endDate)) }; } @@ -111,6 +111,7 @@ const store = createStore({ state.startDate = date; }, setEndDate(state, date) { + console.log(date) state.endDate = date; }, setPersonsPickedIds(state, ids) { From 72a62a3a1b28233864a74203797ebd5889a3e2c3 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 5 Apr 2022 16:03:07 +0200 Subject: [PATCH 023/132] prefill startdate with now --- .../public/vuejs/AccompanyingCourseWorkCreate/store.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js index 7b6c2b22e..3c2e034d7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js @@ -20,7 +20,7 @@ const store = createStore({ .map(p => p.person), personsReachables: window.accompanyingCourse.participations.filter(p => p.endDate == null) .map(p => p.person), - startDate: new Date(), + startDate: dateToISO(new Date()), endDate: null, isLoadingSocialActions: false, isPostingWork: false, From ad6a68487c1e9ba24fda9877c4de551a2267a704 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 6 Apr 2022 11:24:01 +0200 Subject: [PATCH 024/132] fix datepicker for householdmember editor --- .../components/Dates.vue | 19 ++++++++++--------- .../HouseholdMembersEditor/store/index.js | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue index 94c1a146a..12867741d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue @@ -66,18 +66,19 @@ export default { }, startDate: { get() { - return [ - this.$store.state.startDate.getFullYear(), - (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'), - this.$store.state.startDate.getDate().toString().padStart(2, '0') - ].join('-'); + return this.$store.state.startDate; + // return [ + // this.$store.state.startDate.getFullYear(), + // (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'), + // this.$store.state.startDate.getDate().toString().padStart(2, '0') + // ].join('-'); }, set(value) { - let - [year, month, day] = value.split('-'), - dValue = new Date(year, month-1, day); + // let + // [year, month, day] = value.split('-'), + // dValue = new Date(year, month-1, day); - this.$store.dispatch('setStartDate', dValue); + this.$store.dispatch('setStartDate', value); } } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js index cc5ab497c..fcb12d9f5 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js @@ -2,7 +2,7 @@ import { createStore } from 'vuex'; import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod, fetchAddressSuggestionByPerson} from './../api.js'; import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods.js' import { fetchHouseholdByAddressReference } from 'ChillPersonAssets/lib/household.js'; -import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js'; +import { datetimeToISO, dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js'; const debug = process.env.NODE_ENV !== 'production'; @@ -30,7 +30,7 @@ const store = createStore({ } return 0; }), - startDate: new Date(), + startDate: dateToISO(new Date()), /** * Indicates if the destination is: * @@ -278,7 +278,7 @@ const store = createStore({ type: conc.person.type }, start_date: { - datetime: datetimeToISO(state.startDate) + datetime: datetimeToISO(ISOToDate(state.startDate)) } }; From e663bae5c4d492f471eead0881c69e76b7c858ff Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 6 Apr 2022 11:26:04 +0200 Subject: [PATCH 025/132] fix datepicker for social action edit form. still a problem with the display of already set evaluation dates... need to be transformed to correct format to display --- .../vuejs/AccompanyingCourseWorkEdit/App.vue | 8 ++++---- .../components/FormEvaluation.vue | 12 ++++++------ .../vuejs/AccompanyingCourseWorkEdit/store.js | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue index bcfa53e45..668385b8a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue @@ -439,18 +439,18 @@ export default { ]), startDate: { get() { - return dateToISO(this.$store.state.startDate); + return this.$store.state.startDate; }, set(v) { - this.$store.commit('setStartDate', ISOToDate(v)); + this.$store.commit('setStartDate', v); } }, endDate: { get() { - return dateToISO(this.$store.state.endDate); + return this.$store.state.endDate; }, set(v) { - this.$store.commit('setEndDate', ISOToDate(v)); + this.$store.commit('setEndDate', v); } }, note: { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue index eff62bbbb..d2b17ec2c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue @@ -306,26 +306,26 @@ export default { }, startDate: { get() { - return dateToISO(this.evaluation.startDate); + return this.evaluation.startDate; }, set(v) { - this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: ISOToDate(v) }); + this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: v }); } }, endDate: { get() { - return dateToISO(this.evaluation.endDate); + return this.evaluation.endDate; }, set(v) { - this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: ISOToDate(v) }); + this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: v }); } }, maxDate: { get() { - return dateToISO(this.evaluation.maxDate); + return this.evaluation.maxDate; }, set(v) { - this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: ISOToDate(v) }); + this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: v }); } }, warningInterval: { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js index 4ce0b8ebe..0bfe61d94 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js @@ -1,5 +1,5 @@ import { createStore } from 'vuex'; -import { datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js'; +import { dateToISO, ISOToDate, datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js'; import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js'; import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js'; import { fetchResults, makeFetch } from 'ChillMainAssets/lib/api/apiMethods.js'; @@ -13,9 +13,9 @@ const store = createStore({ state: { work: window.accompanyingCourseWork, startDate: window.accompanyingCourseWork.startDate !== null ? - ISOToDatetime(window.accompanyingCourseWork.startDate.datetime) : null, + dateToISO(new Date(window.accompanyingCourseWork.startDate.datetime)) : null, endDate: window.accompanyingCourseWork.endDate !== null ? - ISOToDatetime(window.accompanyingCourseWork.endDate.datetime) : null, + dateToISO(new Date(window.accompanyingCourseWork.endDate.datetime)) : null, note: window.accompanyingCourseWork.note, goalsPicked: window.accompanyingCourseWork.goals, goalsForAction: [], @@ -73,10 +73,10 @@ const store = createStore({ type: 'accompanying_period_work', id: state.work.id, startDate: state.startDate === null ? null : { - datetime: datetimeToISO(state.startDate) + datetime: datetimeToISO(ISOToDate(state.startDate)) }, endDate: state.endDate === null ? null : { - datetime: datetimeToISO(state.endDate) + datetime: datetimeToISO(ISOToDate(state.endDate)) }, note: state.note, persons: state.personsPicked.map(p => ({id: p.id, type: p.type})), @@ -110,9 +110,9 @@ const store = createStore({ id: e.evaluation.id, type: e.evaluation.type }, - startDate: e.startDate !== null ? { datetime: datetimeToISO(e.startDate) } : null, - endDate: e.endDate !== null ? { datetime: datetimeToISO(e.endDate) } : null, - maxDate: e.maxDate !== null ? { datetime: datetimeToISO(e.maxDate) } : null, + startDate: e.startDate !== null ? { datetime: datetimeToISO(ISOToDate(e.startDate)) } : null, + endDate: e.endDate !== null ? { datetime: datetimeToISO(ISOToDate(e.endDate)) } : null, + maxDate: e.maxDate !== null ? { datetime: datetimeToISO(ISOToDate(e.maxDate)) } : null, warningInterval: intervalDaysToISO(e.warningInterval), comment: e.comment, documents: e.documents From 988b67bd4b9122c85dc755ec4e36549cbcc43424 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 3 Mar 2022 16:24:37 +0100 Subject: [PATCH 026/132] logic added to only keep youngest descendant. works for issue, seems not to for action --- .../ChillActivityBundle/Entity/Activity.php | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index 0a344236c..f80d4ab86 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -229,7 +229,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialAction(SocialAction $socialAction): self { - if (!$this->socialActions->contains($socialAction)) { + $descendants = $socialAction->getDescendants(); + $inCollection = false; + + if(null != $descendants) { + foreach ($descendants as $d) { + $inCollection = $this->socialActions->contains($d); + } + } else { + $inCollection = $this->socialActions->contains($socialAction); + } + + if(!$inCollection) { $this->socialActions[] = $socialAction; } @@ -238,7 +249,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialIssue(SocialIssue $socialIssue): self { - if (!$this->socialIssues->contains($socialIssue)) { + $descendants = $socialIssue->getDescendants(); + $inCollection = false; + + if(null != $descendants) { + foreach ($descendants as $d) { + $inCollection = $this->socialIssues->contains($d); + } + } else { + $inCollection = $this->socialIssues->contains($socialIssue); + } + + if(!$inCollection) { $this->socialIssues[] = $socialIssue; } From 432b105be567a5b1669565d3e052227e01e852a1 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 3 Mar 2022 16:29:35 +0100 Subject: [PATCH 027/132] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c278ca93e..cf4991560 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,6 +87,9 @@ and this project adheres to * [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537) * [onthefly] trim trailing whitespace in email of person and thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/542) +* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471) +## Test releases + ### test release 2022-02-21 * [notifications] Word 'un' changed to number '1' for notifications in user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/483) From f35479e4d210e9f1810cd084d8e4f8d6112a402f Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 4 Mar 2022 12:06:53 +0100 Subject: [PATCH 028/132] fix logic in activity entity --- .../ChillActivityBundle/Entity/Activity.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index f80d4ab86..034e6073c 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -230,18 +230,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialAction(SocialAction $socialAction): self { $descendants = $socialAction->getDescendants(); - $inCollection = false; - if(null != $descendants) { + if(count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialActions->contains($d); + if ($inCollection) { + return $this; + } } } else { - $inCollection = $this->socialActions->contains($socialAction); - } - - if(!$inCollection) { - $this->socialActions[] = $socialAction; + if (!$this->socialActions->contains($socialAction)) { + $this->socialActions[] = $socialAction; + }; } return $this; @@ -250,18 +250,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialIssue(SocialIssue $socialIssue): self { $descendants = $socialIssue->getDescendants(); - $inCollection = false; - if(null != $descendants) { + if(count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialIssues->contains($d); + if ($inCollection) { + return $this; + } } } else { - $inCollection = $this->socialIssues->contains($socialIssue); - } - - if(!$inCollection) { - $this->socialIssues[] = $socialIssue; + if (!$this->socialIssues->contains($socialIssue)) { + $this->socialIssues[] = $socialIssue; + }; } return $this; From 7851d9956e9c3bf07a8dac7e5c5f96763c6f004c Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 4 Mar 2022 12:07:29 +0100 Subject: [PATCH 029/132] csfixes --- src/Bundle/ChillActivityBundle/Entity/Activity.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index 034e6073c..f183ced60 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -35,6 +35,7 @@ use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Serializer\Annotation\DiscriminatorMap; use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Serializer\Annotation\SerializedName; +use function count; /** * Class Activity. @@ -231,9 +232,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac { $descendants = $socialAction->getDescendants(); - if(count($descendants) > 0) { + if (count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialActions->contains($d); + if ($inCollection) { return $this; } @@ -241,7 +243,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac } else { if (!$this->socialActions->contains($socialAction)) { $this->socialActions[] = $socialAction; - }; + } } return $this; @@ -251,9 +253,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac { $descendants = $socialIssue->getDescendants(); - if(count($descendants) > 0) { + if (count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialIssues->contains($d); + if ($inCollection) { return $this; } @@ -261,7 +264,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac } else { if (!$this->socialIssues->contains($socialIssue)) { $this->socialIssues[] = $socialIssue; - }; + } } return $this; From d81a41bb1783d6b4c27de27b77df6c33511cc10b Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Mon, 7 Mar 2022 14:53:54 +0100 Subject: [PATCH 030/132] Test added for activity-social action and social issue --- .../Tests/Entity/ActivityTest.php | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php diff --git a/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php new file mode 100644 index 000000000..c67c99894 --- /dev/null +++ b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php @@ -0,0 +1,98 @@ +addChild($child); + $grandChild = new SocialAction(); + $child->addChild($grandChild); + + $activity = new Activity(); + + $activity->addSocialAction($parent); + + $this->assertCount(1, $activity->getSocialActions()); + $this->assertContains($parent, $activity->getSocialActions()); + + $activity->addSocialAction($grandChild); + + $this->assertCount(1, $activity->getSocialActions()); + $this->assertContains($grandChild, $activity->getSocialActions()); + $this->assertNotContains($parent, $activity->getSocialActions()); + + $activity->addSocialAction($child); + + $this->assertCount(1, $activity->getSocialActions()); + $this->assertContains($grandChild, $activity->getSocialActions()); + $this->assertNotContains($parent, $activity->getSocialActions()); + $this->assertNotContains($child, $activity->getSocialActions()); + + $activity->addSocialAction($another = new SocialAction()); + + $this->assertCount(2, $activity->getSocialActions()); + $this->assertContains($grandChild, $activity->getSocialActions()); + $this->assertContains($another, $activity->getSocialActions()); + $this->assertNotContains($parent, $activity->getSocialActions()); + $this->assertNotContains($child, $activity->getSocialActions()); + } + + public function testHierarchySocialIssues(): void + { + $parent = new SocialIssue(); + $child = new SocialIssue(); + + $parent->addChild($child); + $grandChild = new SocialIssue(); + $child->addChild($grandChild); + + $activity = new Activity(); + + $activity->addSocialIssue($parent); + + $this->assertCount(1, $activity->getSocialIssues()); + $this->assertContains($parent, $activity->getSocialIssues()); + + $activity->addSocialIssue($grandChild); + + $this->assertCount(1, $activity->getSocialIssues()); + $this->assertContains($grandChild, $activity->getSocialIssues()); + $this->assertNotContains($parent, $activity->getSocialIssues()); + + $activity->addSocialIssue($child); + + $this->assertCount(1, $activity->getSocialIssues()); + $this->assertContains($grandChild, $activity->getSocialIssues()); + $this->assertNotContains($parent, $activity->getSocialIssues()); + $this->assertNotContains($child, $activity->getSocialIssues()); + + $activity->addSocialIssue($another = new SocialIssue()); + + $this->assertCount(2, $activity->getSocialIssues()); + $this->assertContains($grandChild, $activity->getSocialIssues()); + $this->assertContains($another, $activity->getSocialIssues()); + $this->assertNotContains($parent, $activity->getSocialIssues()); + $this->assertNotContains($child, $activity->getSocialIssues()); + } + +} \ No newline at end of file From ea21f2d9c4070fa98341a056700e6d9871c1acea Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 16 Mar 2022 11:55:19 +0100 Subject: [PATCH 031/132] improvement, but still not correct --- .../ChillActivityBundle/Entity/Activity.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index f183ced60..db16ac9f6 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -235,15 +235,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac if (count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialActions->contains($d); - if ($inCollection) { return $this; } } - } else { - if (!$this->socialActions->contains($socialAction)) { - $this->socialActions[] = $socialAction; - } + } + if (!$this->socialActions->contains($socialAction)) { + $this->socialActions[] = $socialAction; } return $this; @@ -256,15 +254,14 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac if (count($descendants) > 0) { foreach ($descendants as $d) { $inCollection = $this->socialIssues->contains($d); - if ($inCollection) { return $this; } } - } else { - if (!$this->socialIssues->contains($socialIssue)) { - $this->socialIssues[] = $socialIssue; - } + } + + if (!$this->socialIssues->contains($socialIssue)) { + $this->socialIssues[] = $socialIssue; } return $this; From f09870931c7f8b3e945f7e52f2007b0839a0f384 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 22 Mar 2022 13:45:20 +0100 Subject: [PATCH 032/132] switch to using getDescendantsWithThis() --- src/Bundle/ChillActivityBundle/Entity/Activity.php | 13 +++++-------- .../Entity/SocialWork/SocialAction.php | 2 +- .../Entity/SocialWork/SocialIssue.php | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index db16ac9f6..ac67a73e4 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -230,7 +230,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialAction(SocialAction $socialAction): self { - $descendants = $socialAction->getDescendants(); + $descendants = $socialAction->getDescendantsWithThis(); if (count($descendants) > 0) { foreach ($descendants as $d) { @@ -240,16 +240,14 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac } } } - if (!$this->socialActions->contains($socialAction)) { - $this->socialActions[] = $socialAction; - } + $this->socialActions[] = $socialAction; return $this; } public function addSocialIssue(SocialIssue $socialIssue): self { - $descendants = $socialIssue->getDescendants(); + $descendants = $socialIssue->getDescendantsWithThis(); if (count($descendants) > 0) { foreach ($descendants as $d) { @@ -260,9 +258,8 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac } } - if (!$this->socialIssues->contains($socialIssue)) { - $this->socialIssues[] = $socialIssue; - } + $this->socialIssues[] = $socialIssue; + return $this; } diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php index ec5e5a8e5..01f30f140 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php @@ -169,7 +169,7 @@ class SocialAction } /** - * @return Collection|self[] All the descendants with the current entity (this) + * @return Collection|self[] All the descendants including the current entity (this) */ public function getDescendantsWithThis(): Collection { diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php index c735c0132..fb277f56c 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php @@ -202,7 +202,7 @@ class SocialIssue } /** - * @return Collection|self[] All the descendants with the current entity (this) + * @return Collection|self[] All the descendants including the current entity (this) */ public function getDescendantsWithThis(): Collection { From c0ee51068cf09f093168ae1967107e25b4517f26 Mon Sep 17 00:00:00 2001 From: nobohan Date: Thu, 7 Apr 2022 16:55:54 +0200 Subject: [PATCH 033/132] avoid address reference search on undefined post code --- CHANGELOG.md | 1 + .../vuejs/Address/components/AddAddress/AddressSelection.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c278ca93e..ddc97b7b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to ## Unreleased +* [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561) * [main] notification toggle read: correct js syntax for compilation in production (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/548) * [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535) * [activity] espace entre les boutons pour supprimer les documents diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue index 18e0caca3..2c8e17687 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue @@ -119,7 +119,7 @@ export default { }, listenInputSearch(query) { //console.log('listenInputSearch', query, this.isAddressSelectorOpen); - if (!this.entity.selected.writeNew.postcode) { + if (!this.entity.selected.writeNew.postcode && 'id' in this.entity.selected.city) { if (query.length > 2) { this.isLoading = true; searchReferenceAddresses(query, this.entity.selected.city).then( From a78c62789c88b43f982700d744a14cdf028673cd Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 8 Apr 2022 18:56:37 +0200 Subject: [PATCH 034/132] if parent in collection replace with child, problem, sibling isn't added --- src/Bundle/ChillActivityBundle/Entity/Activity.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index ac67a73e4..f157401a7 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -231,6 +231,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac public function addSocialAction(SocialAction $socialAction): self { $descendants = $socialAction->getDescendantsWithThis(); + $parent = $socialAction->getParent(); + + dump($this->socialActions); + dump($parent); + + $parentKey = array_search($parent, $this->socialActions->toArray()); + + if (null !== $parentKey) { + dump(true); + $this->socialActions[$parentKey] = $socialAction; + // return $this; + } if (count($descendants) > 0) { foreach ($descendants as $d) { From 5eea202586de5c49098949c7fd88e9939f22b9ae Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 8 Apr 2022 19:04:13 +0200 Subject: [PATCH 035/132] fix adding sibling action --- src/Bundle/ChillActivityBundle/Entity/Activity.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index f157401a7..016c4b6fa 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -237,8 +237,9 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac dump($parent); $parentKey = array_search($parent, $this->socialActions->toArray()); + dump($parentKey); - if (null !== $parentKey) { + if (false !== $parentKey) { dump(true); $this->socialActions[$parentKey] = $socialAction; // return $this; From 03b0a8766eefbae23144df14fbf58cb0abafe444 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Fri, 8 Apr 2022 19:12:11 +0200 Subject: [PATCH 036/132] remove dumps --- src/Bundle/ChillActivityBundle/Entity/Activity.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index 016c4b6fa..dba4f9c62 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -233,14 +233,9 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac $descendants = $socialAction->getDescendantsWithThis(); $parent = $socialAction->getParent(); - dump($this->socialActions); - dump($parent); - $parentKey = array_search($parent, $this->socialActions->toArray()); - dump($parentKey); if (false !== $parentKey) { - dump(true); $this->socialActions[$parentKey] = $socialAction; // return $this; } From ebc4ec0d7c2b5eba3d571b1de57b1fd21c45d332 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 19 Apr 2022 15:09:25 +0200 Subject: [PATCH 037/132] updating openingdate parcours fixed --- .../components/StartDate.vue | 26 ++++++++++++++----- .../vuejs/AccompanyingCourse/js/i18n.js | 2 +- .../vuejs/AccompanyingCourse/store/index.js | 6 +---- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue index 349581452..b6a0344e8 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue @@ -5,9 +5,9 @@
- -
- +
+ +
@@ -23,10 +23,12 @@ import { mapState, mapGetters } from 'vuex'; export default { name: 'startDate', methods: { - updateStartDate(event) { - const date = event.target.value; - // console.log(date) + updateStartDate(e) { + e.preventDefault(); + const date = e.target.previousSibling.value; + this.$store.dispatch('updateStartDate', date) + .then(this.$toast.open({type: 'success', message: this.$t('startdate.update')})) .catch(({name, violations}) => { if (name === 'ValidationException' || name === 'AccessException') { violations.forEach((violation) => this.$toast.open({message: violation})); @@ -43,4 +45,14 @@ export default { } } - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index f1e2de958..a3a8ede2d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -153,7 +153,7 @@ const appMessages = { }, startdate: { change: "Date d'ouverture", - date: "Date d'ouverture", + update: "La nouvelle date d'ouverture a été bien enregistrée" }, // catch errors 'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.", diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js index 06a3606ab..5d73aa2ed 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -322,7 +322,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou } }, updateStartDate(state, date) { - console.log('new state date', date) state.accompanyingCourse.openingDate = date; } }, @@ -814,11 +813,8 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou }) }, updateStartDate({commit}, payload) { - console.log('payload', payload) - const date = ISOToDate(payload); const url = `/api/1.0/person/accompanying-course/${id}.json`; - const body = { type: "accompanying_period", openingDate: { datetime: datetimeToISO(date) }}; - console.log('body', body) + const body = { type: "accompanying_period", openingDate: { datetime: datetimeToISO(ISOToDate(payload)) }}; return makeFetch('PATCH', url, body) .then((response) => { commit('updateStartDate', response.openingDate); From 8882c99f5a56a44edc7f5024576c30fe3ae257f4 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 5 Apr 2022 15:56:02 +0200 Subject: [PATCH 038/132] fix datepicker for social action --- .../public/vuejs/AccompanyingCourseWorkCreate/App.vue | 9 ++++----- .../public/vuejs/AccompanyingCourseWorkCreate/store.js | 7 ++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue index 503a00c59..758cd7e5e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue @@ -227,19 +227,18 @@ export default { }, startDate: { get() { - let d = this.$store.state.startDate; - return dateToISO(d); + return this.$store.state.startDate; }, set(value) { - this.$store.commit('setStartDate', ISOToDate(value)); + this.$store.commit('setStartDate', value); } }, endDate: { get() { - return dateToISO(this.$store.state.endDate); + return this.$store.state.endDate; }, set(value) { - this.$store.commit('setEndDate', ISOToDate(value)); + this.$store.commit('setEndDate', value); } }, setSocialIssue: { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js index 408115257..7b6c2b22e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js @@ -1,6 +1,6 @@ import { createStore } from 'vuex'; -import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js'; +import { datetimeToISO, dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js'; import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js'; // import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js'; import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods'; @@ -47,7 +47,7 @@ const store = createStore({ id: state.socialActionPicked.id }, startDate: { - datetime: datetimeToISO(state.startDate) + datetime: datetimeToISO(ISOToDate(state.startDate)) }, persons: [] }; @@ -61,7 +61,7 @@ const store = createStore({ if (null !== state.endDate) { payload.endDate = { - datetime: datetimeToISO(state.endDate) + datetime: datetimeToISO(ISOToDate(state.endDate)) }; } @@ -111,6 +111,7 @@ const store = createStore({ state.startDate = date; }, setEndDate(state, date) { + console.log(date) state.endDate = date; }, setPersonsPickedIds(state, ids) { From 66ab38c60ff03db6e6f852be2e5f0cba04b97819 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 5 Apr 2022 16:03:07 +0200 Subject: [PATCH 039/132] prefill startdate with now --- .../public/vuejs/AccompanyingCourseWorkCreate/store.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js index 7b6c2b22e..3c2e034d7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js @@ -20,7 +20,7 @@ const store = createStore({ .map(p => p.person), personsReachables: window.accompanyingCourse.participations.filter(p => p.endDate == null) .map(p => p.person), - startDate: new Date(), + startDate: dateToISO(new Date()), endDate: null, isLoadingSocialActions: false, isPostingWork: false, From de9d2aa88527de3390b70b53c44ad0968fda5ccf Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 6 Apr 2022 11:24:01 +0200 Subject: [PATCH 040/132] fix datepicker for householdmember editor --- .../components/Dates.vue | 19 ++++++++++--------- .../HouseholdMembersEditor/store/index.js | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue index 040d316bb..03feb0329 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue @@ -66,18 +66,19 @@ export default { }, startDate: { get() { - return [ - this.$store.state.startDate.getFullYear(), - (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'), - this.$store.state.startDate.getDate().toString().padStart(2, '0') - ].join('-'); + return this.$store.state.startDate; + // return [ + // this.$store.state.startDate.getFullYear(), + // (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'), + // this.$store.state.startDate.getDate().toString().padStart(2, '0') + // ].join('-'); }, set(value) { - let - [year, month, day] = value.split('-'), - dValue = new Date(year, month-1, day); + // let + // [year, month, day] = value.split('-'), + // dValue = new Date(year, month-1, day); - this.$store.dispatch('setStartDate', dValue); + this.$store.dispatch('setStartDate', value); } } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js index f09b19787..87e465a8d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js @@ -2,7 +2,7 @@ import { createStore } from 'vuex'; import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod, fetchAddressSuggestionByPerson} from './../api.js'; import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods.js' import { fetchHouseholdByAddressReference } from 'ChillPersonAssets/lib/household.js'; -import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js'; +import { datetimeToISO, dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js'; const debug = process.env.NODE_ENV !== 'production'; @@ -30,7 +30,7 @@ const store = createStore({ } return 0; }), - startDate: new Date(), + startDate: dateToISO(new Date()), /** * Indicates if the destination is: * @@ -278,7 +278,7 @@ const store = createStore({ type: conc.person.type }, start_date: { - datetime: datetimeToISO(state.startDate) + datetime: datetimeToISO(ISOToDate(state.startDate)) } }; From 65e6471a02ac72453c79151188025915755b3e08 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 6 Apr 2022 11:26:04 +0200 Subject: [PATCH 041/132] fix datepicker for social action edit form. still a problem with the display of already set evaluation dates... need to be transformed to correct format to display --- .../vuejs/AccompanyingCourseWorkEdit/App.vue | 8 ++++---- .../components/FormEvaluation.vue | 12 ++++++------ .../vuejs/AccompanyingCourseWorkEdit/store.js | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue index bcfa53e45..668385b8a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue @@ -439,18 +439,18 @@ export default { ]), startDate: { get() { - return dateToISO(this.$store.state.startDate); + return this.$store.state.startDate; }, set(v) { - this.$store.commit('setStartDate', ISOToDate(v)); + this.$store.commit('setStartDate', v); } }, endDate: { get() { - return dateToISO(this.$store.state.endDate); + return this.$store.state.endDate; }, set(v) { - this.$store.commit('setEndDate', ISOToDate(v)); + this.$store.commit('setEndDate', v); } }, note: { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue index 53e2b72f3..cad070de3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue @@ -309,26 +309,26 @@ export default { }, startDate: { get() { - return dateToISO(this.evaluation.startDate); + return this.evaluation.startDate; }, set(v) { - this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: ISOToDate(v) }); + this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: v }); } }, endDate: { get() { - return dateToISO(this.evaluation.endDate); + return this.evaluation.endDate; }, set(v) { - this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: ISOToDate(v) }); + this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: v }); } }, maxDate: { get() { - return dateToISO(this.evaluation.maxDate); + return this.evaluation.maxDate; }, set(v) { - this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: ISOToDate(v) }); + this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: v }); } }, warningInterval: { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js index 4ce0b8ebe..0bfe61d94 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js @@ -1,5 +1,5 @@ import { createStore } from 'vuex'; -import { datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js'; +import { dateToISO, ISOToDate, datetimeToISO, ISOToDatetime, intervalDaysToISO, intervalISOToDays } from 'ChillMainAssets/chill/js/date.js'; import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js'; import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js'; import { fetchResults, makeFetch } from 'ChillMainAssets/lib/api/apiMethods.js'; @@ -13,9 +13,9 @@ const store = createStore({ state: { work: window.accompanyingCourseWork, startDate: window.accompanyingCourseWork.startDate !== null ? - ISOToDatetime(window.accompanyingCourseWork.startDate.datetime) : null, + dateToISO(new Date(window.accompanyingCourseWork.startDate.datetime)) : null, endDate: window.accompanyingCourseWork.endDate !== null ? - ISOToDatetime(window.accompanyingCourseWork.endDate.datetime) : null, + dateToISO(new Date(window.accompanyingCourseWork.endDate.datetime)) : null, note: window.accompanyingCourseWork.note, goalsPicked: window.accompanyingCourseWork.goals, goalsForAction: [], @@ -73,10 +73,10 @@ const store = createStore({ type: 'accompanying_period_work', id: state.work.id, startDate: state.startDate === null ? null : { - datetime: datetimeToISO(state.startDate) + datetime: datetimeToISO(ISOToDate(state.startDate)) }, endDate: state.endDate === null ? null : { - datetime: datetimeToISO(state.endDate) + datetime: datetimeToISO(ISOToDate(state.endDate)) }, note: state.note, persons: state.personsPicked.map(p => ({id: p.id, type: p.type})), @@ -110,9 +110,9 @@ const store = createStore({ id: e.evaluation.id, type: e.evaluation.type }, - startDate: e.startDate !== null ? { datetime: datetimeToISO(e.startDate) } : null, - endDate: e.endDate !== null ? { datetime: datetimeToISO(e.endDate) } : null, - maxDate: e.maxDate !== null ? { datetime: datetimeToISO(e.maxDate) } : null, + startDate: e.startDate !== null ? { datetime: datetimeToISO(ISOToDate(e.startDate)) } : null, + endDate: e.endDate !== null ? { datetime: datetimeToISO(ISOToDate(e.endDate)) } : null, + maxDate: e.maxDate !== null ? { datetime: datetimeToISO(ISOToDate(e.maxDate)) } : null, warningInterval: intervalDaysToISO(e.warningInterval), comment: e.comment, documents: e.documents From bc550ea42aa1d13447ef0f0d658cdf6f51e2c349 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 19 Apr 2022 15:09:25 +0200 Subject: [PATCH 042/132] updating openingdate parcours fixed --- .../components/StartDate.vue | 26 ++++++++++++++----- .../vuejs/AccompanyingCourse/js/i18n.js | 2 +- .../vuejs/AccompanyingCourse/store/index.js | 6 +---- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue index 349581452..b6a0344e8 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue @@ -5,9 +5,9 @@
- -
- +
+ +
@@ -23,10 +23,12 @@ import { mapState, mapGetters } from 'vuex'; export default { name: 'startDate', methods: { - updateStartDate(event) { - const date = event.target.value; - // console.log(date) + updateStartDate(e) { + e.preventDefault(); + const date = e.target.previousSibling.value; + this.$store.dispatch('updateStartDate', date) + .then(this.$toast.open({type: 'success', message: this.$t('startdate.update')})) .catch(({name, violations}) => { if (name === 'ValidationException' || name === 'AccessException') { violations.forEach((violation) => this.$toast.open({message: violation})); @@ -43,4 +45,14 @@ export default { } } - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index f1e2de958..a3a8ede2d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -153,7 +153,7 @@ const appMessages = { }, startdate: { change: "Date d'ouverture", - date: "Date d'ouverture", + update: "La nouvelle date d'ouverture a été bien enregistrée" }, // catch errors 'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.", diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js index 06a3606ab..5d73aa2ed 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -322,7 +322,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou } }, updateStartDate(state, date) { - console.log('new state date', date) state.accompanyingCourse.openingDate = date; } }, @@ -814,11 +813,8 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou }) }, updateStartDate({commit}, payload) { - console.log('payload', payload) - const date = ISOToDate(payload); const url = `/api/1.0/person/accompanying-course/${id}.json`; - const body = { type: "accompanying_period", openingDate: { datetime: datetimeToISO(date) }}; - console.log('body', body) + const body = { type: "accompanying_period", openingDate: { datetime: datetimeToISO(ISOToDate(payload)) }}; return makeFetch('PATCH', url, body) .then((response) => { commit('updateStartDate', response.openingDate); From 0ce23230da611069b094b90f2a554233df3df069 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 20 Apr 2022 13:32:51 +0200 Subject: [PATCH 043/132] fix evaluation datepickers in edit --- .../vuejs/AccompanyingCourseWorkEdit/App.vue | 10 +-- .../components/FormEvaluation.vue | 81 ++++++++++--------- .../vuejs/AccompanyingCourseWorkEdit/store.js | 7 +- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue index 668385b8a..bab64018a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue @@ -521,12 +521,12 @@ export default { this.$store.commit('removeReferrer', u); }, goToGenerateWorkflow({link}) { - console.log('save before leave to generate workflow') - const callback = (data) => { - window.location.assign(link); - }; + // console.log('save before leave to generate workflow') + const callback = (data) => { + window.location.assign(link); + }; - return this.$store.dispatch('submit', callback) + return this.$store.dispatch('submit', callback) .catch(e => { console.log(e); throw e; }); }, submit() { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue index cad070de3..ca0d16eec 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue @@ -298,38 +298,39 @@ export default { } }, computed: { - ...mapState([ - 'isPosting' - ]), + ...mapState([ + 'isPosting' + ]), getTemplatesAvailables() { - return this.$store.getters.getTemplatesAvailablesForEvaluation(this.evaluation.evaluation); + return this.$store.getters.getTemplatesAvailablesForEvaluation(this.evaluation.evaluation); }, canGenerate() { - return !this.$store.state.isPosting && this.template !== null; + return !this.$store.state.isPosting && this.template !== null; }, startDate: { - get() { - return this.evaluation.startDate; - }, - set(v) { - this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: v }); - } + get() { + console.log('evaluation', this.evaluation); + return this.evaluation.startDate; + }, + set(v) { + this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: v }); + } }, endDate: { - get() { - return this.evaluation.endDate; - }, - set(v) { - this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: v }); - } + get() { + return this.evaluation.endDate; + }, + set(v) { + this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: v }); + } }, maxDate: { - get() { - return this.evaluation.maxDate; - }, - set(v) { - this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: v }); - } + get() { + return this.evaluation.maxDate; + }, + set(v) { + this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: v }); + } }, warningInterval: { get() { return this.evaluation.warningInterval; }, @@ -344,7 +345,7 @@ export default { ISOToDatetime, canEditDocument(document) { return 'storedObject' in document ? - this.mime.includes(document.storedObject.type) && document.storedObject.keyInfos.length === 0 : false; + this.mime.includes(document.storedObject.type) && document.storedObject.keyInfos.length === 0 : false; }, listAllStatus() { console.log('load all status'); @@ -360,16 +361,16 @@ export default { }, buildEditLink(storedObject) { return `/wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent( - window.location.pathname + window.location.search + window.location.hash); + window.location.pathname + window.location.search + window.location.hash); }, submitBeforeGenerate({template}) { - const callback = (data) => { - let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id; + const callback = (data) => { + let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id; - window.location.assign(buildLink(template, evaluationId, 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation')); - }; + window.location.assign(buildLink(template, evaluationId, 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation')); + }; - return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; }); + return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; }); }, onInputDocumentTitle(event) { const id = Number(event.target.id); @@ -395,20 +396,20 @@ export default { }, removeDocument(document) { if (window.confirm("Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre \"" + document.title +"\" ?")) { - this.$store.commit('removeDocument', {key: this.evaluation.key, document: document}); + this.$store.commit('removeDocument', {key: this.evaluation.key, document: document}); } }, goToGenerateWorkflowEvaluationDocument({event, link, workflowName, payload}) { - const callback = (data) => { - let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key); - let updatedDocument = evaluation.documents.find(d => d.key === payload.doc.key); - window.location.assign(buildLinkCreate(workflowName, - 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', updatedDocument.id)); - }; + const callback = (data) => { + let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key); + let updatedDocument = evaluation.documents.find(d => d.key === payload.doc.key); + window.location.assign(buildLinkCreate(workflowName, + 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', updatedDocument.id)); + }; - return this.$store.dispatch('submit', callback) - .catch(e => { console.log(e); throw e; }); - }, + return this.$store.dispatch('submit', callback) + .catch(e => { console.log(e); throw e; }); + }, }, } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js index 0bfe61d94..570a3b670 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js @@ -132,9 +132,9 @@ const store = createStore({ var k = Object.assign(e, { key: index, editEvaluation: false, - startDate: e.startDate !== null ? ISOToDatetime(e.startDate.datetime) : null, - endDate: e.endDate !== null ? ISOToDatetime(e.endDate.datetime) : null, - maxDate: e.maxDate !== null ? ISOToDatetime(e.maxDate.datetime) : null, + startDate: e.startDate !== null ? dateToISO(new Date(e.startDate.datetime)) : null, + endDate: e.endDate !== null ? dateToISO(new Date(e.endDate.datetime)) : null, + maxDate: e.maxDate !== null ? dateToISO(new Date(e.maxDate.datetime)) : null, warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null, documents: e.documents.map((d, docIndex) => { return Object.assign(d, { @@ -264,6 +264,7 @@ const store = createStore({ .startDate = date; }, setEvaluationEndDate(state, {key, date}) { + console.log('commit date', date) state.evaluationsPicked.find(e => e.key === key) .endDate = date; }, From ad1e7b576cfefe67976709d2aaff262b5b8cb964 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 20 Apr 2022 13:58:45 +0200 Subject: [PATCH 044/132] remove success toast for parcours startdate + take empty string values into account for action dates --- .../public/vuejs/AccompanyingCourse/components/StartDate.vue | 3 +-- .../public/vuejs/AccompanyingCourseWorkEdit/store.js | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue index b6a0344e8..564fc74b7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue @@ -28,14 +28,13 @@ export default { const date = e.target.previousSibling.value; this.$store.dispatch('updateStartDate', date) - .then(this.$toast.open({type: 'success', message: this.$t('startdate.update')})) .catch(({name, violations}) => { if (name === 'ValidationException' || name === 'AccessException') { violations.forEach((violation) => this.$toast.open({message: violation})); } else { this.$toast.open({message: 'An error occurred'}) } - }); + }) }, }, computed: { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js index 570a3b670..77cc4800e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js @@ -69,13 +69,14 @@ const store = createStore({ return []; }, buildPayload(state) { + console.log('end date', state.endDate); return { type: 'accompanying_period_work', id: state.work.id, - startDate: state.startDate === null ? null : { + startDate: state.startDate === null || state.startDate === '' ? null : { datetime: datetimeToISO(ISOToDate(state.startDate)) }, - endDate: state.endDate === null ? null : { + endDate: state.endDate === null || state.endDate === '' ? null : { datetime: datetimeToISO(ISOToDate(state.endDate)) }, note: state.note, From be77c3729b7700b5827482d9346d544dd7dca62e Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 20 Apr 2022 14:09:28 +0200 Subject: [PATCH 045/132] take empty date strings into account --- .../public/vuejs/AccompanyingCourse/store/index.js | 3 ++- .../public/vuejs/AccompanyingCourseWorkEdit/store.js | 6 +++--- .../public/vuejs/HouseholdMembersEditor/store/index.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js index 5d73aa2ed..57415565b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -814,7 +814,8 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou }, updateStartDate({commit}, payload) { const url = `/api/1.0/person/accompanying-course/${id}.json`; - const body = { type: "accompanying_period", openingDate: { datetime: datetimeToISO(ISOToDate(payload)) }}; + const date = payload === null || payload === '' ? null : { datetime: datetimeToISO(ISOToDate(payload)) } + const body = { type: "accompanying_period", openingDate: date}; return makeFetch('PATCH', url, body) .then((response) => { commit('updateStartDate', response.openingDate); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js index 77cc4800e..502704716 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js @@ -111,9 +111,9 @@ const store = createStore({ id: e.evaluation.id, type: e.evaluation.type }, - startDate: e.startDate !== null ? { datetime: datetimeToISO(ISOToDate(e.startDate)) } : null, - endDate: e.endDate !== null ? { datetime: datetimeToISO(ISOToDate(e.endDate)) } : null, - maxDate: e.maxDate !== null ? { datetime: datetimeToISO(ISOToDate(e.maxDate)) } : null, + startDate: e.startDate === null || e.startDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.startDate)) }, + endDate: e.endDate === null || e.endDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.endDate)) }, + maxDate: e.maxDate === null || e.maxDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.maxDate)) }, warningInterval: intervalDaysToISO(e.warningInterval), comment: e.comment, documents: e.documents diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js index 87e465a8d..75b3c215f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js @@ -278,7 +278,7 @@ const store = createStore({ type: conc.person.type }, start_date: { - datetime: datetimeToISO(ISOToDate(state.startDate)) + datetime: state.startDate === null || state.startDate === '' ? null : datetimeToISO(ISOToDate(state.startDate)) } }; From 92d394b6695055d322c46c9e675d5e6d077e7c07 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 20 Apr 2022 14:22:35 +0200 Subject: [PATCH 046/132] changelog updated --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f26e64a1..626d41658 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to * [Activity form] invert 'incoming' and 'receiving' in Activity form * [Activity form] keep the same order for 'attendee' field in new and edit form * [list with period] use "sameas" test operator to introduce requestor in list +* [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545) ## Test releases From b24de76d77f56f8e5b5c04d5056692b6641bb979 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 20 Apr 2022 15:16:26 +0200 Subject: [PATCH 047/132] display agents traitants --- CHANGELOG.md | 2 +- .../AccompanyingCourseWork/_item.html.twig | 32 +++++++++---------- ...st_recent_by_accompanying_period.html.twig | 9 ++++++ .../translations/messages.fr.yml | 2 +- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 459f95005..44915aa63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ and this project adheres to * [list with period] use "sameas" test operator to introduce requestor in list * [notification email on course designation] allow raw string in email content generation * [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older - +* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568) ## Test releases diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig index 8ff8a0617..3d4f46425 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig @@ -25,22 +25,6 @@
- {% if w.createdBy %} -
-
-

{{ 'Referrers'|trans }}

-
-
-

- {% for u in w.referrers %} - {{ u|chill_entity_render_box }} - {% if not loop.last %}, {% endif %} - {% endfor %} -

-
-
- {% endif %} - {%- if w.persons -%}
@@ -78,6 +62,22 @@
{% endif %} + {%- if w.referrers -%} +
+
+

{{ 'Referrers'|trans }}

+
+
+ {% for u in w.referrers %} + + {{ u|chill_entity_render_box }} + {% if not loop.last %}, {% endif %} + + {% endfor %} +
+
+ {% endif %} + {%- if w.socialAction.issue -%}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig index 7f2fb0177..4621cb97a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig @@ -28,6 +28,15 @@ {{ w.handlingThierParty|chill_entity_render_box }} {% endif %} + {% if w.referrers %} +
  • + {{ 'Referrers'|trans ~ ' : ' }} + {% for u in w.referrers %} + {{ u|chill_entity_render_box }} + {% if not loop.last %}, {% endif %} + {% endfor %} +
  • + {% endif %}
  • {{ 'Participants'|trans ~ ' : ' }} {% for p in w.persons %} diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index c6baf9513..535985d23 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -214,7 +214,7 @@ No requestor: Pas de demandeur No resources: "Pas d'interlocuteurs privilégiés" Persons associated: Usagers concernés Referrer: Référent -Referrers: Référents +Referrers: Agents traitants Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible. Add to household now: Ajouter à un ménage Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours From c6be7955fd3eb1669e3bae5c791b424cfd4817f3 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 21 Apr 2022 13:59:45 +0200 Subject: [PATCH 048/132] remove save button datepicker parcours. set timeout --- .../components/StartDate.vue | 64 ++++++++++++++----- 1 file changed, 48 insertions(+), 16 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue index b33447b25..c987150be 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue @@ -6,8 +6,7 @@
    - - +
    @@ -17,31 +16,64 @@ diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue index ca5d01b50..9dd85fa73 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue @@ -106,6 +106,9 @@ export default { this.$emit('getReferenceAddresses', this.value); if (this.value.center) { this.updateMapCenter(this.value.center); + if (this.value.center.coordinates) { + this.entity.selected.postcode.coordinates = this.value.center.coordinates; + } } } }, diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php index ccb48c160..0809863f6 100644 --- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php +++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php @@ -71,6 +71,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw 'id' => $address->getPostCode()->getId(), 'name' => $address->getPostCode()->getName(), 'code' => $address->getPostCode()->getCode(), + 'center' => $address->getPostcode()->getCenter(), ], 'country' => [ 'id' => $address->getPostCode()->getCountry()->getId(), From 6662e0fb5f9bfeb8fa3896bfb9bafdc25aa8d28a Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 27 Apr 2022 10:40:11 +0200 Subject: [PATCH 098/132] upd CHANGELOG --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ea16e7fc..c517623e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to ## Unreleased +* [address] fix bug when editing address: update location and addressreferenceId + better update of the map in edition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/593) + * [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565) * [Activity form] invert 'incoming' and 'receiving' in Activity form * [Activity form] keep the same order for 'attendee' field in new and edit form @@ -36,7 +38,7 @@ and this project adheres to * [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older * [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error * [Notifications] delay the sending of notificaiton to kernel.terminate -* [Notifications / Period user change] fix the sending of notification when user changes +* [Notifications / Period user change] fix the sending of notification when user changes * [Activity form] invert 'incoming' and 'receiving' in Activity form * [Activity form] keep the same order for 'attendee' field in new and edit form * [list with period] use "sameas" test operator to introduce requestor in list From 48daed26f9501fb40f2f5112a994f75c34bf802f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 27 Apr 2022 14:30:50 +0200 Subject: [PATCH 099/132] replace BadRequestException by BadRequestHttpException --- .../CRUD/Controller/ApiController.php | 16 ++++++++-------- .../CRUD/Controller/CRUDController.php | 3 ++- .../Controller/SearchController.php | 3 +-- .../Controller/WorkflowController.php | 3 +-- .../AccompanyingCourseApiController.php | 10 +++++----- .../Controller/AccompanyingCourseController.php | 4 ++-- .../Controller/HouseholdController.php | 6 +++--- .../Controller/HouseholdMemberController.php | 4 ++-- .../Controller/SingleTaskController.php | 3 +-- 9 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php index a780af78a..9bf43b37e 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php +++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php @@ -16,9 +16,9 @@ use Chill\MainBundle\Serializer\Model\Collection; use Exception; use LogicException; use RuntimeException; -use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Serializer\Exception\NotEncodableValueException; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; @@ -55,7 +55,7 @@ class ApiController extends AbstractCRUDController return $this->entityDelete('_entity', $request, $id, $_format); default: - throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This method is not implemented'); + throw new BadRequestHttpException('This method is not implemented'); } } @@ -120,7 +120,7 @@ class ApiController extends AbstractCRUDController return $this->entityPostAction('_entity', $request, $_format); default: - throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This method is not implemented'); + throw new BadRequestHttpException('This method is not implemented'); } } @@ -160,7 +160,7 @@ class ApiController extends AbstractCRUDController try { $entity = $this->deserialize($action, $request, $_format, $entity); } catch (NotEncodableValueException $e) { - throw new BadRequestException('invalid json', 400, $e); + throw new BadRequestHttpException('invalid json', 400, $e); } $errors = $this->validate($action, $request, $_format, $entity); @@ -273,7 +273,7 @@ class ApiController extends AbstractCRUDController try { $postedData = $this->getSerializer()->deserialize($request->getContent(), $postedDataType, $_format, $postedDataContext); } catch (\Symfony\Component\Serializer\Exception\UnexpectedValueException $e) { - throw new BadRequestException(sprintf('Unable to deserialize posted ' . + throw new BadRequestHttpException(sprintf('Unable to deserialize posted ' . 'data: %s', $e->getMessage()), 0, $e); } @@ -290,7 +290,7 @@ class ApiController extends AbstractCRUDController break; default: - throw new BadRequestException('this method is not supported'); + throw new BadRequestHttpException('this method is not supported'); } $errors = $this->validate($action, $request, $_format, $entity, [$postedData]); @@ -408,7 +408,7 @@ class ApiController extends AbstractCRUDController return $this->json($entity, Response::HTTP_OK, [], $context); } - throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This format is not implemented'); + throw new BadRequestHttpException('This format is not implemented'); } protected function entityPostAction($action, Request $request, string $_format): Response @@ -418,7 +418,7 @@ class ApiController extends AbstractCRUDController try { $entity = $this->deserialize($action, $request, $_format, $entity); } catch (NotEncodableValueException $e) { - throw new BadRequestException('invalid json', 400, $e); + throw new BadRequestHttpException('invalid json', 400, $e); } $errors = $this->validate($action, $request, $_format, $entity); diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php index 62d587ab3..edca07b41 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php +++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php @@ -25,6 +25,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Serializer\SerializerInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -1140,6 +1141,6 @@ class CRUDController extends AbstractController return $this->json($entity, Response::HTTP_OK, [], $context); } - throw new \Symfony\Component\HttpFoundation\Exception\BadRequestException('This format is not implemented'); + throw new BadRequestHttpException('This format is not implemented'); } } diff --git a/src/Bundle/ChillMainBundle/Controller/SearchController.php b/src/Bundle/ChillMainBundle/Controller/SearchController.php index 41349336a..496538665 100644 --- a/src/Bundle/ChillMainBundle/Controller/SearchController.php +++ b/src/Bundle/ChillMainBundle/Controller/SearchController.php @@ -22,7 +22,6 @@ use Chill\MainBundle\Search\UnknowSearchNameException; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\Extension\Core\Type\FormType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; -use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; @@ -216,7 +215,7 @@ class SearchController extends AbstractController $types = $request->query->get('type', []); if (count($types) === 0) { - throw new BadRequestException('The request must contains at ' + throw new BadRequestHttpException('The request must contains at ' . ' one type'); } diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php index 103de6d84..2803ff254 100644 --- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php +++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php @@ -25,7 +25,6 @@ use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\Extension\Core\Type\FormType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; -use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; @@ -144,7 +143,7 @@ class WorkflowController extends AbstractController public function getAccessByAccessKey(EntityWorkflowStep $entityWorkflowStep, Request $request): Response { if (null === $accessKey = $request->query->get('accessKey', null)) { - throw new BadRequestException('accessKey is missing'); + throw new BadRequestHttpException('accessKey is missing'); } if (!$this->getUser() instanceof User) { diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php index f1306640b..21db6b00c 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php @@ -33,10 +33,10 @@ use DateInterval; use DateTimeImmutable; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\EventDispatcher\EventDispatcherInterface; -use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\Serializer\Exception\RuntimeException; @@ -185,7 +185,7 @@ final class AccompanyingCourseApiController extends ApiController ->deserialize($request->getContent(), Person::class, $_format, []); if (null === $person) { - throw new BadRequestException('person id not found'); + throw new BadRequestHttpException('person id not found'); } // TODO add acl @@ -204,7 +204,7 @@ final class AccompanyingCourseApiController extends ApiController break; default: - throw new BadRequestException('This method is not supported'); + throw new BadRequestHttpException('This method is not supported'); } $errors = $this->validator->validate($accompanyingPeriod); @@ -247,12 +247,12 @@ final class AccompanyingCourseApiController extends ApiController } if (null === $requestor) { - throw new BadRequestException('Could not find any person or thirdparty', 0, null); + throw new BadRequestHttpException('Could not find any person or thirdparty', 0, null); } $accompanyingPeriod->setRequestor($requestor); } else { - throw new BadRequestException('method not supported'); + throw new BadRequestHttpException('method not supported'); } $errors = $this->validator->validate($accompanyingPeriod); diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php index b15f8adb9..4d78bb42b 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php @@ -21,9 +21,9 @@ use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\Form\Extension\Core\Type\SubmitType; -use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\SerializerInterface; use Symfony\Component\Validator\ConstraintViolationInterface; @@ -255,7 +255,7 @@ class AccompanyingCourseController extends Controller $personIds = $request->query->get('person_id'); if (false === is_array($personIds)) { - throw new BadRequestException('person_id parameter should be an array'); + throw new BadRequestHttpException('person_id parameter should be an array'); } foreach ($personIds as $personId) { diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php index 7b6dc201e..503867a3e 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php @@ -21,8 +21,8 @@ use Chill\PersonBundle\Security\Authorization\HouseholdVoter; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\FormInterface; -use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; @@ -202,7 +202,7 @@ class HouseholdController extends AbstractController $this->denyAccessUnlessGranted(HouseholdVoter::EDIT, $household); if (!$request->query->has('address_id')) { - throw new BadRequestException('parameter address_id is missing'); + throw new BadRequestHttpException('parameter address_id is missing'); } $address_id = $request->query->getInt('address_id'); @@ -218,7 +218,7 @@ class HouseholdController extends AbstractController } if (null === $address) { - throw new BadRequestException('The edited address does not belongs to the household'); + throw new BadRequestHttpException('The edited address does not belongs to the household'); } $form = $this->createForm(AddressDateType::class, $address, []); diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php index 2ec72a786..a595eb8c7 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php @@ -20,9 +20,9 @@ use Chill\PersonBundle\Form\HouseholdMemberType; use Chill\PersonBundle\Household\MembersEditor; use Chill\PersonBundle\Repository\AccompanyingPeriodRepository; use Chill\PersonBundle\Security\Authorization\PersonVoter; -use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Serializer\Exception; @@ -105,7 +105,7 @@ class HouseholdMemberController extends ApiController $ids = $request->query->get('persons', []); if (0 === count($ids)) { - throw new BadRequestException('parameters persons in query ' . + throw new BadRequestHttpException('parameters persons in query ' . 'is not an array or empty'); } diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php index b4b6727b2..355015215 100644 --- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php +++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php @@ -33,7 +33,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormFactoryInterface; -use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -494,7 +493,7 @@ final class SingleTaskController extends AbstractController ); default: - throw new BadRequestException("format not supported: {$_format}"); + throw new BadRequestHttpException("format not supported: {$_format}"); } } From 916e3ab02def2ae6e36963d36109eb6a66a91dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 27 Apr 2022 14:31:59 +0200 Subject: [PATCH 100/132] ignore phpcs cache for phpstan --- phpstan.neon.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index edec00554..3322f9539 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -3,6 +3,7 @@ parameters: paths: - src/ excludePaths: + - .php_cs* - docs/ - src/Bundle/*/Tests/* - src/Bundle/*/tests/* From 4794039250c3106d5fb3e8901e06ebe65aedb9da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 27 Apr 2022 14:45:42 +0200 Subject: [PATCH 101/132] declare properties used for cache --- phpstan-critical.neon | 5 ----- src/Bundle/ChillPersonBundle/Entity/Person.php | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/phpstan-critical.neon b/phpstan-critical.neon index 262d3012f..1dc516834 100644 --- a/phpstan-critical.neon +++ b/phpstan-critical.neon @@ -5,11 +5,6 @@ parameters: count: 1 path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php - - - message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$currentHouseholdParticipationAt\\.$#" - count: 3 - path: src/Bundle/ChillPersonBundle/Entity/Person.php - - message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$relation\\.$#" count: 1 diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index ef522f068..7f2630a1e 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -240,6 +240,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI */ private array $currentHouseholdAt = []; + /** + * Cache for the computation of current household participation. + */ + private array $currentHouseholdParticipationAt = []; + /** * The current person address. * From fa7850196f9a3d32b7878945ba92b3cb4f7a754e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 27 Apr 2022 14:46:08 +0200 Subject: [PATCH 102/132] force using strict type on comparison --- src/Bundle/ChillReportBundle/Controller/ReportController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php index bca915090..33ddd3a39 100644 --- a/src/Bundle/ChillReportBundle/Controller/ReportController.php +++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php @@ -334,7 +334,7 @@ class ReportController extends AbstractController $cFGroupId = $request->query->get('cFGroup'); - if ($cFGroupId) { + if ($request->query->has('cFGroup')) { return $this->redirect( $this->generateUrl( 'report_new', @@ -391,7 +391,7 @@ class ReportController extends AbstractController { $cFGroupId = $request->query->get('cFGroup'); - if ($cFGroupId) { + if ($request->query->has('cFGroup')) { return $this->redirect( $this->generateUrl( 'report_export_list', From 9789c794025aa30e5b6e5001b53dfed6dd9406ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 27 Apr 2022 14:46:43 +0200 Subject: [PATCH 103/132] use strict type comparison and replace use of BadRequestException by BadRequestHttpException --- .../Controller/HouseholdMemberController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php index a595eb8c7..cacba0630 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php @@ -121,7 +121,8 @@ class HouseholdMemberController extends ApiController } } - if ($householdId = $request->query->get('household', false)) { + if ($request->query->has('household')) { + $householdId = $request->query->get('household', false); $household = $em->getRepository(Household::class) ->find($householdId); $allowHouseholdCreate = false; @@ -189,7 +190,7 @@ class HouseholdMemberController extends ApiController ['groups' => ['read']] ); } catch (Exception\InvalidArgumentException|Exception\UnexpectedValueException $e) { - throw new BadRequestException("Deserialization error: {$e->getMessage()}", 45896, $e); + throw new BadRequestHttpException("Deserialization error: {$e->getMessage()}", 45896, $e); } // TODO ACL From 9244040d7b5f462ab7e9d31d9bc8b27e4e284d57 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 27 Apr 2022 14:51:37 +0200 Subject: [PATCH 104/132] csfixes --- src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php | 1 - .../Security/Authorization/AccompanyingPeriodCommentVoter.php | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index 20156e4c4..8495afa89 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php @@ -1258,7 +1258,6 @@ class AccompanyingPeriod implements */ public function setPinnedComment(?Comment $comment = null): self { - if (null !== $this->pinnedComment) { $this->addComment($this->pinnedComment); } diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php index 64fdbb796..6e326b990 100644 --- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php +++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodCommentVoter.php @@ -41,8 +41,10 @@ class AccompanyingPeriodCommentVoter extends Voter switch ($attribute) { case self::EDIT: return $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod()); + case self::DELETE: return $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod()); + default: throw new UnexpectedValueException("This attribute {$attribute} is not supported"); } From 09aa7ff631c6358d6a37ebcc038105237bc81258 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 27 Apr 2022 17:13:38 +0200 Subject: [PATCH 105/132] change date to datetime for evaluation document --- ...companyingPeriodWorkEvaluationDocument.php | 4 +- .../migrations/Version20220427150431.php | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php index cf3fb8a9f..b3feb40dd 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php @@ -40,7 +40,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct private ?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation = null; /** - * @ORM\Column(type="date_immutable", nullable=true, options={"default": null}) + * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null}) * @Serializer\Groups({"read"}) * @Serializer\Groups({"accompanying_period_work_evaluation:create"}) */ @@ -111,7 +111,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct private ?string $title = ''; /** - * @ORM\Column(type="date_immutable", nullable=true, options={"default": null}) + * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null}) * @Serializer\Groups({"read"}) * @Serializer\Groups({"accompanying_period_work_evaluation:create"}) */ diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php b/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php new file mode 100644 index 000000000..15defc95f --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php @@ -0,0 +1,41 @@ +addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER createdat TYPE TIMESTAMP(0) WITHOUT TIME ZONE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER createdat DROP DEFAULT'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER updatedat TYPE TIMESTAMP(0) WITHOUT TIME ZONE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER updatedat DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_evaluation_document.createdAt IS \'(DC2Type:datetime_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_evaluation_document.updatedAt IS \'(DC2Type:datetime_immutable)\''); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER createdAt TYPE DATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER createdAt DROP DEFAULT'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER updatedAt TYPE DATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER updatedAt DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_evaluation_document.createdat IS \'(DC2Type:date_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_evaluation_document.updatedat IS \'(DC2Type:date_immutable)\''); + } +} From daa09e2df3ed2db9f3cd63c2ea5f8aa073f8e5a7 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 27 Apr 2022 17:15:04 +0200 Subject: [PATCH 106/132] update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ea16e7fc..93cb442dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,12 +36,13 @@ and this project adheres to * [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older * [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error * [Notifications] delay the sending of notificaiton to kernel.terminate -* [Notifications / Period user change] fix the sending of notification when user changes +* [Notifications / Period user change] fix the sending of notification when user changes * [Activity form] invert 'incoming' and 'receiving' in Activity form * [Activity form] keep the same order for 'attendee' field in new and edit form * [list with period] use "sameas" test operator to introduce requestor in list * [notification email on course designation] allow raw string in email content generation * [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older +* [evaluation_document] changing date to datetime in order to display the time at which document was created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/569) ### 2021-04-13 From 46755252253d42ffc581a7493cff71318f35c79e Mon Sep 17 00:00:00 2001 From: nobohan Date: Thu, 28 Apr 2022 17:34:53 +0200 Subject: [PATCH 107/132] [person] add maritalStatusComment to PersonDocGenNormalizer --- CHANGELOG.md | 4 +++- .../Serializer/Normalizer/PersonDocGenNormalizer.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 312c86971..ed24da1c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to ## Unreleased +* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582s) + * [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561) * [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560) * [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565) @@ -35,7 +37,7 @@ and this project adheres to * [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older * [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error * [Notifications] delay the sending of notificaiton to kernel.terminate -* [Notifications / Period user change] fix the sending of notification when user changes +* [Notifications / Period user change] fix the sending of notification when user changes * [Activity form] invert 'incoming' and 'receiving' in Activity form * [Activity form] keep the same order for 'attendee' field in new and edit form * [list with period] use "sameas" test operator to introduce requestor in list diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php index 89f01bf94..4fbfa8162 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php @@ -114,6 +114,7 @@ class PersonDocGenNormalizer implements 'gender' => $this->translator->trans($person->getGender()), 'maritalStatus' => null !== ($ms = $person->getMaritalStatus()) ? $this->translatableStringHelper->localize($ms->getName()) : '', 'maritalStatusDate' => $this->normalizer->normalize($person->getMaritalStatusDate(), $format, $dateContext), + 'maritalStatusComment' => $this->normalizer->normalize($person->getMaritalStatusComment(), $format, $dateContext), 'email' => $person->getEmail(), 'firstPhoneNumber' => $this->normalizer->normalize($person->getPhonenumber() ?? $person->getMobilenumber(), $format, $phonenumberContext), 'fixPhoneNumber' => $this->normalizer->normalize($person->getPhonenumber(), $format, $phonenumberContext), @@ -123,7 +124,7 @@ class PersonDocGenNormalizer implements 'memo' => $person->getMemo(), 'numberOfChildren' => (string) $person->getNumberOfChildren(), 'address' => $this->normalizer->normalize($person->getCurrentPersonAddress(), $format, $addressContext), - //'resources' => $this->normalizer->normalize($person->getResources(), $format, $personResourceContext), + 'resources' => $this->normalizer->normalize($person->getResources(), $format, $personResourceContext), ]; if ($context['docgen:person:with-household'] ?? false) { From 671950708ca83a90995336c55337a5ba8dcfb9fe Mon Sep 17 00:00:00 2001 From: nobohan Date: Fri, 29 Apr 2022 10:54:56 +0200 Subject: [PATCH 108/132] [person] prevent circular references in PersonDocGenNormalizer --- CHANGELOG.md | 3 +- .../Normalizer/PersonDocGenNormalizer.php | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed24da1c1..a9e95a0d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ and this project adheres to ## Unreleased -* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582s) +* [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527) +* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582) * [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561) * [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560) diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php index 4fbfa8162..d1d6f0a95 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php @@ -23,6 +23,7 @@ use Chill\PersonBundle\Repository\Relationships\RelationshipRepository; use Chill\PersonBundle\Templating\Entity\PersonRenderInterface; use DateTimeInterface; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\DataFixtures\Exception\CircularReferenceException; use libphonenumber\PhoneNumber; use Symfony\Component\Serializer\Exception\UnexpectedValueException; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; @@ -52,6 +53,8 @@ class PersonDocGenNormalizer implements private TranslatorInterface $translator; + private const CIRCULAR_KEY = 'person:circular'; + public function __construct( PersonRenderInterface $personRender, RelationshipRepository $relationshipRepository, @@ -68,6 +71,17 @@ class PersonDocGenNormalizer implements public function normalize($person, $format = null, array $context = []) { + + try { + $context = $this->addCircularToContext($person, $context); + } catch (CircularReferenceException $circularReferenceException) { + return [ + 'isNull' => true, + 'isCircular' => true, + 'text' => '' + ]; + } + /** @var Person $person */ $dateContext = $context; $dateContext['docgen:expects'] = DateTimeInterface::class; @@ -178,6 +192,36 @@ class PersonDocGenNormalizer implements ); } + private function addCircularToContext($person, $context) { + if (null === $person) { + $key = 'n'; + } else { + $key = spl_object_hash($person); + } + + if (!\array_key_exists(self::CIRCULAR_KEY, $context)) { + $context[self::CIRCULAR_KEY] = [$key]; + + return $context; + } + + $occurences = array_reduce($context[self::CIRCULAR_KEY], function ($carry, $item) use ($key) { + if ($key === $item) { + $carry++; + } + return $carry; + }, 0); + + if (2 <= $occurences) { + throw new CircularReferenceException(); + } + + $context[self::CIRCULAR_KEY][] = $key; + + return $context; + } + + private function hasGroup($context, string $group): bool { $groups = $context[AbstractNormalizer::GROUPS] ?? []; From ed35822eb5ec200050bc43f846c0eda95f522703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 29 Apr 2022 14:10:41 +0200 Subject: [PATCH 109/132] changelog: release --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d25aa9a8..3c041f9cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,13 +11,17 @@ and this project adheres to ## Unreleased + +## Test releases + +### 2021-04-28 + * [address] fix bug when editing address: update location and addressreferenceId + better update of the map in edition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/593) * [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561) * [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560) * [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565) * [parcours]: Comments can be unpinned + edit/delete for all users that are allowed to edit parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/566) -## Test releases ### 2021-04-26 From 1e06926f6d0d77d7ebce5e9448ee0592554f63dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 29 Apr 2022 14:11:32 +0200 Subject: [PATCH 110/132] Load relationships without gender in french fixtures --- CHANGELOG.md | 1 + .../DataFixtures/ORM/LoadRelations.php | 24 ++++++------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c041f9cf..61c429e57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to ## Unreleased +* Load relationships without gender in french fixtures ## Test releases diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php index e2bb469bc..c7ce18091 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php @@ -21,23 +21,13 @@ class LoadRelations extends Fixture implements FixtureGroupInterface public const RELATION_KEY = 'relations'; public const RELATIONS = [ - ['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fille']], - ['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fils']], - ['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fille']], - ['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fils']], - - ['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Frère']], - ['title' => ['fr' => 'Soeur'], 'reverseTitle' => ['fr' => 'Soeur']], - ['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Soeur']], - - ['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-frère']], - ['title' => ['fr' => 'Demi-soeur'], 'reverseTitle' => ['fr' => 'Demi-soeur']], - ['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-soeur']], - - ['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Neveu']], - ['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Nièce']], - ['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Neveu']], - ['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Nièce']], + ['title' => ['fr' => 'Parent'], 'reverseTitle' => ['fr' => 'Enfant']], + ['title' => ['fr' => 'En couple'], 'reverseTitle' => ['fr' => 'En couple']], + ['title' => ['fr' => 'Beau parent'], 'reverseTitle' => ['fr' => 'Belle-fille·beau-fils']], + ['title' => ['fr' => 'Frère·Sœur'], 'reverseTitle' => ['fr' => 'Frère·Sœur']], + ['title' => ['fr' => 'Demi-frère·sœur'], 'reverseTitle' => ['fr' => 'Demi-frère·sœur']], + ['title' => ['fr' => 'Grand-parent'], 'reverseTitle' => ['fr' => 'Petit-enfant']], + ['title' => ['fr' => 'Oncle·Tante'], 'reverseTitle' => ['fr' => 'Neveu·Nièce']], ]; public static function getGroups(): array From 770010ceb83abe3918dfc1b5a1b6830199b5fd70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 29 Apr 2022 15:51:54 +0200 Subject: [PATCH 111/132] Add command to remove old draft accompanying periods --- CHANGELOG.md | 1 + ...emoveOldDraftAccompanyingPeriodCommand.php | 64 +++++++++++ .../OldDraftAccompanyingPeriodRemover.php | 103 ++++++++++++++++++ ...raftAccompanyingPeriodRemoverInterface.php | 19 ++++ .../migrations/Version20220429133023.php | 39 +++++++ 5 files changed, 226 insertions(+) create mode 100644 src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php create mode 100644 src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php create mode 100644 src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220429133023.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 61c429e57..a985c8493 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to * Load relationships without gender in french fixtures +* Add command to remove old draft accompanying periods ## Test releases diff --git a/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php b/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php new file mode 100644 index 000000000..5d503007f --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Command/RemoveOldDraftAccompanyingPeriodCommand.php @@ -0,0 +1,64 @@ +logger = $logger; + $this->remover = $remover; + } + + protected function configure(): void + { + $this + ->setDescription('Remove draft accompanying period which are still draft and unused') + ->addArgument('interval', InputArgument::OPTIONAL, 'The interval for unactive periods', 'P15D'); + } + + protected function execute(InputInterface $input, OutputInterface $output): int + { + $this->logger->info('[' . $this->getName() . '] started', [ + 'interval' => $input->getArgument('interval'), + ]); + + try { + $interval = new DateInterval($input->getArgument('interval')); + } catch (Exception $e) { + $this->logger->error('[' . $this->getName() . '] bad interval'); + + throw $e; + } + + $this->remover->remove($interval); + + $this->logger->info('[' . $this->getName() . '] end of command'); + + return 0; + } +} diff --git a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php new file mode 100644 index 000000000..47a34e88c --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemover.php @@ -0,0 +1,103 @@ +em = $em; + $this->logger = $logger; + } + + public function remove(DateInterval $interval): void + { + $this->logger->debug('[' . __CLASS__ . '] start to remove old periods', [ + 'interval' => $interval->format('%d days'), + ]); + + $beforeDate = (new DateTimeImmutable('now'))->sub($interval); + + $results = $this->em->wrapInTransaction(static function (EntityManagerInterface $em) use ($beforeDate) { + $subDQL = 'SELECT p FROM ' . AccompanyingPeriod::class . ' p WHERE p.createdAt < :beforeDate AND p.step = :draft'; + $parameters = [ + 'beforeDate' => $beforeDate, + 'draft' => AccompanyingPeriod::STEP_DRAFT, + ]; + + $resources = $em->createQuery( + 'DELETE ' . AccompanyingPeriod\Resource::class . " r WHERE r.accompanyingPeriod IN ({$subDQL})" + ) + ->setParameters($parameters) + ->getSingleScalarResult(); + + $participations = $em->createQuery( + 'DELETE ' . AccompanyingPeriodParticipation::class . " part WHERE part.accompanyingPeriod IN ({$subDQL})" + ) + ->setParameters($parameters) + ->getSingleScalarResult(); + + $userHistory = $em->createQuery( + 'DELETE ' . AccompanyingPeriod\UserHistory::class . " h WHERE h.accompanyingPeriod IN ({$subDQL})" + ) + ->setParameters($parameters) + ->getSingleScalarResult(); + + $comments = $em->createQuery( + 'DELETE ' . AccompanyingPeriod\Comment::class . " c WHERE c.accompanyingPeriod IN ({$subDQL})" + ) + ->setParameters($parameters) + ->getSingleScalarResult(); + + $documents = $em->createQuery( + 'DELETE ' . AccompanyingCourseDocument::class . " d WHERE d.course IN ({$subDQL})" + ) + ->setParameters($parameters) + ->getSingleScalarResult(); + + $periods = $em + ->createQuery( + 'DELETE ' . AccompanyingPeriod::class . ' p WHERE p.createdAt < :beforeDate + AND p.step = :draft' + ) + ->setParameter(':beforeDate', $beforeDate, Types::DATETIME_IMMUTABLE) + ->setParameter(':draft', AccompanyingPeriod::STEP_DRAFT) + ->getSingleScalarResult(); + + return [ + 'comments' => $comments, + 'documents' => $documents, + 'participations' => $participations, + 'periods' => $periods, + 'resources' => $resources, + 'userHistory' => $userHistory, + ]; + }); + + $this->logger->info('[' . __CLASS__ . '] periods removed', array_merge($results, [ + 'interval' => $interval->format('%d days'), + ])); + } +} diff --git a/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php new file mode 100644 index 000000000..882fefe3b --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Service/AccompanyingPeriod/OldDraftAccompanyingPeriodRemoverInterface.php @@ -0,0 +1,19 @@ +addSql('ALTER TABLE "accompanying_periods_scopes" + DROP CONSTRAINT "fk_87c4eab032a7a428", + ADD CONSTRAINT "fk_87c4eab032a7a428" FOREIGN KEY (accompanying_period_id) REFERENCES chill_person_accompanying_period(id) + '); + } + + public function getDescription(): string + { + return 'apply CASCADE DELETE on entity related to accompanying periods'; + } + + public function up(Schema $schema): void + { + $this->addSql('ALTER TABLE "accompanying_periods_scopes" + DROP CONSTRAINT "fk_87c4eab032a7a428", + ADD CONSTRAINT "fk_87c4eab032a7a428" FOREIGN KEY (accompanying_period_id) REFERENCES chill_person_accompanying_period(id) ON DELETE CASCADE + '); + } +} From fcbf62f61379616fb75eab9323cf5eb6c355e68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 29 Apr 2022 16:41:13 +0200 Subject: [PATCH 112/132] fix cs --- .../migrations/Version20220427150431.php | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php b/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php index 15defc95f..aab3678d9 100644 --- a/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php +++ b/src/Bundle/ChillPersonBundle/migrations/Version20220427150431.php @@ -1,5 +1,12 @@ addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER createdAt TYPE DATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER createdAt DROP DEFAULT'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER updatedAt TYPE DATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER updatedAt DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_evaluation_document.createdat IS \'(DC2Type:date_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_evaluation_document.updatedat IS \'(DC2Type:date_immutable)\''); + } + public function getDescription(): string { return 'change date to datetime for evaluation documents'; @@ -27,15 +45,4 @@ final class Version20220427150431 extends AbstractMigration $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_evaluation_document.createdAt IS \'(DC2Type:datetime_immutable)\''); $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_evaluation_document.updatedAt IS \'(DC2Type:datetime_immutable)\''); } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER createdAt TYPE DATE'); - $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER createdAt DROP DEFAULT'); - $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER updatedAt TYPE DATE'); - $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ALTER updatedAt DROP DEFAULT'); - $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_evaluation_document.createdat IS \'(DC2Type:date_immutable)\''); - $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_work_evaluation_document.updatedat IS \'(DC2Type:date_immutable)\''); - } } From ad96319d97f337522e463baf8e117e83cc082315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 29 Apr 2022 16:41:24 +0200 Subject: [PATCH 113/132] use traits to handle createdAt/updatedAt and by on AccompanyingCourseEvaluationDocument --- .../Doctrine/Model/TrackCreationTrait.php | 3 + .../Doctrine/Model/TrackUpdateTrait.php | 3 + ...companyingPeriodWorkEvaluationDocument.php | 96 ++----------------- 3 files changed, 12 insertions(+), 90 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php index a991399c8..cb01870bc 100644 --- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php +++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php @@ -16,17 +16,20 @@ use DateTime; use DateTimeImmutable; use DateTimeInterface; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Serializer\Annotation as Serializer; trait TrackCreationTrait { /** * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL}) + * @Serializer\Groups({"read"}) */ private ?DateTimeImmutable $createdAt = null; /** * @ORM\ManyToOne(targetEntity=User::class) * @ORM\JoinColumn(nullable=true) + * @Serializer\Groups({"read"}) */ private ?User $createdBy = null; diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php index 3c706459c..fbe967cca 100644 --- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php +++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php @@ -16,17 +16,20 @@ use DateTime; use DateTimeImmutable; use DateTimeInterface; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Serializer\Annotation as Serializer; trait TrackUpdateTrait { /** * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL}) + * @Serializer\Groups({"read"}) */ private ?DateTimeImmutable $updatedAt = null; /** * @ORM\ManyToOne(targetEntity=User::class) * @ORM\JoinColumn(nullable=true) + * @Serializer\Groups({"read"}) */ private ?User $updatedBy = null; diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php index b3feb40dd..5e412a82c 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php @@ -13,10 +13,8 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate; use Chill\DocStoreBundle\Entity\StoredObject; -use Chill\MainBundle\Doctrine\Model\TrackCreationInterface; -use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; -use Chill\MainBundle\Entity\User; -use DateTimeInterface; +use Chill\MainBundle\Doctrine\Model\TrackCreationTrait; +use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait; use Doctrine\ORM\Mapping as ORM; use RuntimeException; use Symfony\Component\Serializer\Annotation as Serializer; @@ -31,6 +29,10 @@ use Symfony\Component\Validator\Constraints as Assert; */ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doctrine\Model\TrackCreationInterface, \Chill\MainBundle\Doctrine\Model\TrackUpdateInterface { + use TrackCreationTrait; + + use TrackUpdateTrait; + /** * @ORM\ManyToOne( * targetEntity=AccompanyingPeriodWorkEvaluation::class, @@ -39,22 +41,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct */ private ?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation = null; - /** - * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null}) - * @Serializer\Groups({"read"}) - * @Serializer\Groups({"accompanying_period_work_evaluation:create"}) - */ - private ?\DateTimeImmutable $createdAt = null; - - /** - * @ORM\ManyToOne( - * targetEntity=User::class - * ) - * @Serializer\Groups({"read"}) - * @Serializer\Groups({"accompanying_period_work_evaluation:create"}) - */ - private ?User $createdBy = null; - /** * @ORM\Id * @ORM\GeneratedValue @@ -110,40 +96,11 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct */ private ?string $title = ''; - /** - * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null}) - * @Serializer\Groups({"read"}) - * @Serializer\Groups({"accompanying_period_work_evaluation:create"}) - */ - private ?\DateTimeImmutable $updatedAt = null; - - /** - * @ORM\ManyToOne( - * targetEntity=User::class - * ) - * @Serializer\Groups({"read"}) - * @Serializer\Groups({"accompanying_period_work_evaluation:create"}) - */ - private ?User $updatedBy = null; - public function getAccompanyingPeriodWorkEvaluation(): ?AccompanyingPeriodWorkEvaluation { return $this->accompanyingPeriodWorkEvaluation; } - /** - * @return \DateTimeImmutable|null - */ - public function getCreatedAt(): ?DateTimeInterface - { - return $this->createdAt; - } - - public function getCreatedBy(): ?User - { - return $this->createdBy; - } - public function getId(): ?int { return $this->id; @@ -172,19 +129,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct return $this->title; } - /** - * @return DateTimeImmutable|null - */ - public function getUpdatedAt(): ?DateTimeInterface - { - return $this->updatedAt; - } - - public function getUpdatedBy(): ?User - { - return $this->updatedBy; - } - public function setAccompanyingPeriodWorkEvaluation(?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation): AccompanyingPeriodWorkEvaluationDocument { // if an evaluation is already associated, we cannot change the association (removing the association, @@ -202,20 +146,6 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct return $this; } - public function setCreatedAt(DateTimeInterface $datetime): TrackCreationInterface - { - $this->createdAt = $datetime; - - return $this; - } - - public function setCreatedBy(User $user): TrackCreationInterface - { - $this->createdBy = $user; - - return $this; - } - /** * @param mixed $key * @@ -248,18 +178,4 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct return $this; } - - public function setUpdatedAt(DateTimeInterface $datetime): TrackUpdateInterface - { - $this->updatedAt = $datetime; - - return $this; - } - - public function setUpdatedBy(User $user): TrackUpdateInterface - { - $this->updatedBy = $user; - - return $this; - } } From 99413cf32846aaf37c81130a302b9b18f9167c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 29 Apr 2022 17:04:55 +0200 Subject: [PATCH 114/132] fix cs --- .../Normalizer/PersonDocGenNormalizer.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php index d1d6f0a95..22ce96ab7 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php @@ -32,6 +32,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface; use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait; use Symfony\Contracts\Translation\TranslatorInterface; +use function array_key_exists; use function array_map; use function implode; use function in_array; @@ -43,6 +44,8 @@ class PersonDocGenNormalizer implements { use NormalizerAwareTrait; + private const CIRCULAR_KEY = 'person:circular'; + private PersonRenderInterface $personRender; private RelationshipRepository $relationshipRepository; @@ -53,8 +56,6 @@ class PersonDocGenNormalizer implements private TranslatorInterface $translator; - private const CIRCULAR_KEY = 'person:circular'; - public function __construct( PersonRenderInterface $personRender, RelationshipRepository $relationshipRepository, @@ -71,14 +72,13 @@ class PersonDocGenNormalizer implements public function normalize($person, $format = null, array $context = []) { - try { $context = $this->addCircularToContext($person, $context); } catch (CircularReferenceException $circularReferenceException) { return [ 'isNull' => true, 'isCircular' => true, - 'text' => '' + 'text' => '', ]; } @@ -192,23 +192,25 @@ class PersonDocGenNormalizer implements ); } - private function addCircularToContext($person, $context) { + private function addCircularToContext($person, $context) + { if (null === $person) { $key = 'n'; } else { $key = spl_object_hash($person); } - if (!\array_key_exists(self::CIRCULAR_KEY, $context)) { + if (!array_key_exists(self::CIRCULAR_KEY, $context)) { $context[self::CIRCULAR_KEY] = [$key]; return $context; } - $occurences = array_reduce($context[self::CIRCULAR_KEY], function ($carry, $item) use ($key) { + $occurences = array_reduce($context[self::CIRCULAR_KEY], static function ($carry, $item) use ($key) { if ($key === $item) { - $carry++; + ++$carry; } + return $carry; }, 0); @@ -221,7 +223,6 @@ class PersonDocGenNormalizer implements return $context; } - private function hasGroup($context, string $group): bool { $groups = $context[AbstractNormalizer::GROUPS] ?? []; From afdc32d4167268af5cb31ac56b24f9bcac6512a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 00:00:52 +0200 Subject: [PATCH 115/132] fix loading report: use FQDN instead of entity shortcut --- src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php index b8de60cf4..eeaffe0b7 100644 --- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php +++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php @@ -14,6 +14,7 @@ namespace Chill\ReportBundle\DataFixtures\ORM; use Chill\CustomFieldsBundle\Entity\CustomField; use Chill\MainBundle\DataFixtures\ORM\LoadScopes; use Chill\MainBundle\DataFixtures\ORM\LoadUsers; +use Chill\PersonBundle\Entity\Person; use Chill\ReportBundle\Entity\Report; use DateTime; use Doctrine\Common\DataFixtures\AbstractFixture; @@ -61,7 +62,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or private function createExpected(ObjectManager $manager) { $charline = $this->container->get('doctrine.orm.entity_manager') - ->getRepository('ChillPersonBundle:Person') + ->getRepository(Person::class) ->findOneBy(['firstName' => 'Charline', 'lastName' => 'DEPARDIEU']); if (null !== $charline) { From 8ba51bafd0055fc0a7be6b20955d00a293613ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 00:06:58 +0200 Subject: [PATCH 116/132] fix loading report: use FQDN instead of entity shortcut --- src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php index eeaffe0b7..a1d705ca2 100644 --- a/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php +++ b/src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php @@ -148,7 +148,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or private function getPeopleRandom($percentage) { $people = $this->container->get('doctrine.orm.entity_manager') - ->getRepository('ChillPersonBundle:Person') + ->getRepository(Person::class) ->findAll(); //keep only a part ($percentage) of the people From a0392b9216b91dd77f2c69f6f7dd0059d3ee5338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 00:20:18 +0200 Subject: [PATCH 117/132] replace some entity shortcut by fqdn * ChillPerson:Person * ChillMain:Center * ChillActivity:Activity --- .../Tests/Controller/ActivityControllerTest.php | 10 +++++----- .../Tests/Form/ActivityTypeTest.php | 4 ++-- .../ChillEventBundle/Controller/EventController.php | 2 +- .../Controller/ParticipationController.php | 2 +- .../DataFixtures/ORM/LoadParticipation.php | 5 +++-- .../Tests/Controller/ParticipationControllerTest.php | 6 +++--- .../Tests/Search/EventSearchTest.php | 2 +- .../ChillMainBundle/Command/SetPasswordCommand.php | 2 +- .../ChillMainBundle/Controller/CenterController.php | 8 ++++---- .../ChillMainBundle/Controller/UserController.php | 4 ++-- .../Test/Export/AbstractExportTest.php | 2 +- .../Tests/Controller/UserControllerTest.php | 2 +- .../Tests/Export/ExportManagerTest.php | 2 +- .../Controller/AccompanyingPeriodController.php | 2 +- .../Controller/PersonAddressController.php | 10 +++++----- .../Form/DataTransformer/PersonToIdTransformer.php | 2 +- .../Controller/AccompanyingPeriodControllerTest.php | 2 +- .../Tests/Controller/PersonAddressControllerTest.php | 4 ++-- .../Tests/Controller/PersonControllerCreateTest.php | 4 ++-- .../Tests/Controller/PersonControllerUpdateTest.php | 4 ++-- .../PersonControllerUpdateWithHiddenFieldsTest.php | 4 ++-- .../Tests/Controller/PersonControllerViewTest.php | 4 ++-- .../PersonControllerViewWithHiddenFieldsTest.php | 4 ++-- .../Controller/PersonDuplicateControllerViewTest.php | 2 +- .../Tests/Form/Type/PickPersonTypeTest.php | 6 +++--- .../Controller/ReportController.php | 12 ++++++------ .../Tests/Controller/ReportControllerNextTest.php | 2 +- .../Tests/Controller/ReportControllerTest.php | 4 ++-- .../Tests/Timeline/TimelineProviderTest.php | 4 ++-- 29 files changed, 61 insertions(+), 60 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php index febf3b820..55b2fb8c0 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php @@ -221,7 +221,7 @@ final class ActivityControllerTest extends WebTestCase } //create groupCenter $groupCenter = new \Chill\MainBundle\Entity\GroupCenter(); - $groupCenter->setCenter($em->getRepository('ChillMainBundle:Center') + $groupCenter->setCenter($em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A'])) ->setPermissionsGroup($withoutActivityPermissionGroup); $em->persist($withoutActivityPermissionGroup); @@ -249,7 +249,7 @@ final class ActivityControllerTest extends WebTestCase $em = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager'); - $activities = $em->getRepository('ChillActivityBundle:Activity') + $activities = $em->getRepository(\Chill\ActivityBundle\Entity\Activity::class) ->findBy(['person' => $person]); if (count($activities) === 0) { @@ -281,7 +281,7 @@ final class ActivityControllerTest extends WebTestCase $em = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager'); - $person = $em->getRepository('ChillPersonBundle:Person') + $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->findOneBy([ 'firstName' => 'Depardieu', 'lastName' => 'Gérard', @@ -339,7 +339,7 @@ final class ActivityControllerTest extends WebTestCase { $user = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:User') + ->getRepository(\Chill\MainBundle\Entity\User::class) ->findOneByUsername($username); if (null === $user) { @@ -349,7 +349,7 @@ final class ActivityControllerTest extends WebTestCase $center = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:Center') + ->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneByName($centerName); // get scope reachable by both role UPDATE and DELETE diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php index 15842e729..0a6518018 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php @@ -68,10 +68,10 @@ final class ActivityTypeTest extends KernelTestCase ->push($request); $this->user = $this->container->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:User') + ->getRepository(\Chill\MainBundle\Entity\User::class) ->findOneBy(['username' => 'center a_social']); $this->center = $this->container->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:Center') + ->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); $token = $prophet->prophesize(); $token->willExtend(AbstractToken::class); diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php index dae04ec12..a07d36ee1 100644 --- a/src/Bundle/ChillEventBundle/Controller/EventController.php +++ b/src/Bundle/ChillEventBundle/Controller/EventController.php @@ -178,7 +178,7 @@ class EventController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id); + $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($person_id); if (null === $person) { throw $this->createNotFoundException('Person not found'); diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php index 1ef545616..52fe3d867 100644 --- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php +++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php @@ -598,7 +598,7 @@ class ParticipationController extends AbstractController $participation = count($persons_ids) > 1 ? clone $participation : $participation; if (null !== $person_id) { - $person = $em->getRepository('ChillPersonBundle:Person') + $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($person_id); if (null === $person) { diff --git a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php index 104a12dbb..925a61495 100644 --- a/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php +++ b/src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php @@ -15,6 +15,7 @@ use Chill\EventBundle\Entity\Event; use Chill\EventBundle\Entity\Participation; use Chill\MainBundle\DataFixtures\ORM\LoadScopes; use Chill\MainBundle\Entity\Center; +use Chill\PersonBundle\Entity\Person; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; @@ -64,11 +65,11 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa public function load(ObjectManager $manager) { - $centers = $manager->getRepository('ChillMainBundle:Center') + $centers = $manager->getRepository(Center::class) ->findAll(); foreach ($centers as $center) { - $people = $manager->getRepository('ChillPersonBundle:Person') + $people = $manager->getRepository(Person::class) ->findBy(['center' => $center]); $events = $this->createEvents($center, $manager); diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php index 9cd9243b3..aa14cf748 100644 --- a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php +++ b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php @@ -453,7 +453,7 @@ final class ParticipationControllerTest extends WebTestCase */ protected function getRandomEvent($centerName = 'Center A', $circleName = 'social') { - $center = $this->em->getRepository('ChillMainBundle:Center') + $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findByName($centerName); $circles = $this->em->getRepository('ChillMainBundle:Scope') @@ -503,10 +503,10 @@ final class ParticipationControllerTest extends WebTestCase */ protected function getRandomPerson($centerName = 'Center A') { - $center = $this->em->getRepository('ChillMainBundle:Center') + $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findByName($centerName); - $persons = $this->em->getRepository('ChillPersonBundle:Person') + $persons = $this->em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->findBy(['center' => $center]); $person = $persons[array_rand($persons)]; diff --git a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php index 30479b1a4..837fbcade 100644 --- a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php +++ b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php @@ -86,7 +86,7 @@ final class EventSearchTest extends WebTestCase ->get('doctrine.orm.entity_manager'); $this->centerA = $this->entityManager - ->getRepository('ChillMainBundle:Center') + ->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); $this->eventType = $this->entityManager diff --git a/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php b/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php index d61aed91c..07e514e6d 100644 --- a/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php +++ b/src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php @@ -43,7 +43,7 @@ class SetPasswordCommand extends Command public function _getUser($username) { return $this->entityManager - ->getRepository('ChillMainBundle:User') + ->getRepository(\Chill\MainBundle\Entity\User::class) ->findOneBy(['username' => $username]); } diff --git a/src/Bundle/ChillMainBundle/Controller/CenterController.php b/src/Bundle/ChillMainBundle/Controller/CenterController.php index fbdca566b..729f2b243 100644 --- a/src/Bundle/ChillMainBundle/Controller/CenterController.php +++ b/src/Bundle/ChillMainBundle/Controller/CenterController.php @@ -54,7 +54,7 @@ class CenterController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $center = $em->getRepository('ChillMainBundle:Center')->find($id); + $center = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->find($id); if (!$center) { throw $this->createNotFoundException('Unable to find Center entity.'); @@ -75,7 +75,7 @@ class CenterController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entities = $em->getRepository('ChillMainBundle:Center')->findAll(); + $entities = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->findAll(); return $this->render('@ChillMain/Center/index.html.twig', [ 'entities' => $entities, @@ -105,7 +105,7 @@ class CenterController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $center = $em->getRepository('ChillMainBundle:Center')->find($id); + $center = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->find($id); if (!$center) { throw $this->createNotFoundException('Unable to find Center entity.'); @@ -125,7 +125,7 @@ class CenterController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $center = $em->getRepository('ChillMainBundle:Center')->find($id); + $center = $em->getRepository(\Chill\MainBundle\Entity\Center::class)->find($id); if (!$center) { throw $this->createNotFoundException('Unable to find Center entity.'); diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php index 5b72115b8..01e7ece26 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserController.php @@ -61,7 +61,7 @@ class UserController extends CRUDController { $em = $this->getDoctrine()->getManager(); - $user = $em->getRepository('ChillMainBundle:User')->find($uid); + $user = $em->getRepository(\Chill\MainBundle\Entity\User::class)->find($uid); if (!$user) { throw $this->createNotFoundException('Unable to find User entity.'); @@ -118,7 +118,7 @@ class UserController extends CRUDController { $em = $this->getDoctrine()->getManager(); - $user = $em->getRepository('ChillMainBundle:User')->find($uid); + $user = $em->getRepository(\Chill\MainBundle\Entity\User::class)->find($uid); if (!$user) { throw $this->createNotFoundException('Unable to find User entity.'); diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php index 18a3f6c66..b4264140b 100644 --- a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php +++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php @@ -83,7 +83,7 @@ abstract class AbstractExportTest extends WebTestCase $em = static::$kernel->getContainer() ->get('doctrine.orm.entity_manager'); - $centers = $em->getRepository('ChillMainBundle:Center') + $centers = $em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findAll(); $circles = $em->getRepository('ChillMainBundle:Scope') ->findAll(); diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php index 42f541d56..c7c916f8b 100644 --- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php @@ -161,7 +161,7 @@ final class UserControllerTest extends WebTestCase $user = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:User') + ->getRepository(\Chill\MainBundle\Entity\User::class) ->findOneBy(['username' => $username]); $this->assertTrue($passwordEncoder->isPasswordValid($user, $password)); diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php index 82693b9c1..87508dfbf 100644 --- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php @@ -672,7 +672,7 @@ final class ExportManagerTest extends KernelTestCase $localUser = $user ?? self::$container->get( 'doctrine.orm.entity_manager' ) - ->getRepository('ChillMainBundle:User') + ->getRepository(\Chill\MainBundle\Entity\User::class) ->findOneBy(['username' => 'center a_social']); $token = new UsernamePasswordToken($localUser, 'password', 'provider'); $tokenStorage = new TokenStorage(); diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php index c34702ad1..2a9c43da7 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php @@ -451,7 +451,7 @@ class AccompanyingPeriodController extends AbstractController private function _getPerson(int $id): Person { $person = $this->getDoctrine()->getManager() - ->getRepository('ChillPersonBundle:Person')->find($id); + ->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($id); if (null === $person) { throw $this->createNotFoundException('Person not found'); diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php index 2d4a60c15..d4c5b334d 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php @@ -43,7 +43,7 @@ class PersonAddressController extends AbstractController public function createAction($person_id, Request $request) { $person = $this->getDoctrine()->getManager() - ->getRepository('ChillPersonBundle:Person') + ->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($person_id); if (null === $person) { @@ -98,7 +98,7 @@ class PersonAddressController extends AbstractController public function editAction($person_id, $address_id) { $person = $this->getDoctrine()->getManager() - ->getRepository('ChillPersonBundle:Person') + ->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($person_id); if (null === $person) { @@ -126,7 +126,7 @@ class PersonAddressController extends AbstractController public function listAction($person_id) { $person = $this->getDoctrine()->getManager() - ->getRepository('ChillPersonBundle:Person') + ->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($person_id); if (null === $person) { @@ -148,7 +148,7 @@ class PersonAddressController extends AbstractController public function newAction($person_id) { $person = $this->getDoctrine()->getManager() - ->getRepository('ChillPersonBundle:Person') + ->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($person_id); if (null === $person) { @@ -175,7 +175,7 @@ class PersonAddressController extends AbstractController public function updateAction($person_id, $address_id, Request $request) { $person = $this->getDoctrine()->getManager() - ->getRepository('ChillPersonBundle:Person') + ->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($person_id); if (null === $person) { diff --git a/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php b/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php index 5e7ed4043..1db70bce5 100644 --- a/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php +++ b/src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php @@ -44,7 +44,7 @@ class PersonToIdTransformer implements DataTransformerInterface } $issue = $this->om - ->getRepository('ChillPersonBundle:Person') + ->getRepository(\Chill\PersonBundle\Entity\Person::class) ->findOneBy(['id' => $id]); if (null === $issue) { diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php index fd674f53b..98fa0ab2d 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php @@ -71,7 +71,7 @@ final class AccompanyingPeriodControllerTest extends WebTestCase 'PHP_AUTH_PW' => 'password', ]); - $center = self::$em->getRepository('ChillMainBundle:Center') + $center = self::$em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); $this->person = (new Person(new DateTime('2015-01-05'))) diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php index 391fad165..7691e9b49 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php @@ -47,7 +47,7 @@ final class PersonAddressControllerTest extends WebTestCase $em = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager'); - $center = $em->getRepository('ChillMainBundle:Center') + $center = $em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); self::$person = (new Person()) @@ -195,7 +195,7 @@ final class PersonAddressControllerTest extends WebTestCase */ protected function refreshPerson() { - self::$person = $this->em->getRepository('ChillPersonBundle:Person') + self::$person = $this->em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find(self::$person->getId()); } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php index b7513d0dc..11f1ee43d 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php @@ -51,14 +51,14 @@ final class PersonControllerCreateTest extends WebTestCase $em = self::$kernel->getContainer()->get('doctrine.orm.entity_manager'); //remove two people created during test - $jesus = $em->getRepository('ChillPersonBundle:Person') + $jesus = $em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->findOneBy(['firstName' => 'God']); if (null !== $jesus) { $em->remove($jesus); } - $jesus2 = $em->getRepository('ChillPersonBundle:Person') + $jesus2 = $em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->findOneBy(['firstName' => 'roger']); if (null !== $jesus2) { diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php index c85b8d058..bb582232e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php @@ -58,7 +58,7 @@ final class PersonControllerUpdateTest extends WebTestCase $this->em = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager'); - $center = $this->em->getRepository('ChillMainBundle:Center') + $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); $this->person = (new Person()) @@ -317,7 +317,7 @@ final class PersonControllerUpdateTest extends WebTestCase */ protected function refreshPerson() { - $this->person = $this->em->getRepository('ChillPersonBundle:Person') + $this->person = $this->em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($this->person->getId()); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php index ac655d8ce..934eddc34 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php @@ -57,7 +57,7 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase $this->em = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager'); - $center = $this->em->getRepository('ChillMainBundle:Center') + $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); $this->person = (new Person()) @@ -211,7 +211,7 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase */ protected function refreshPerson() { - $this->person = $this->em->getRepository('ChillPersonBundle:Person') + $this->person = $this->em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($this->person->getId()); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php index 5a3ecd28f..2a5b4c6b1 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php @@ -42,7 +42,7 @@ final class PersonControllerViewTest extends WebTestCase $this->em = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager'); - $center = $this->em->getRepository('ChillMainBundle:Center') + $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); $this->person = (new Person()) @@ -113,7 +113,7 @@ final class PersonControllerViewTest extends WebTestCase */ protected function refreshPerson() { - $this->person = $this->em->getRepository('ChillPersonBundle:Person') + $this->person = $this->em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($this->person->getId()); } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php index 602dd41e8..6526745a2 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php @@ -42,7 +42,7 @@ final class PersonControllerViewWithHiddenFieldsTest extends WebTestCase $this->em = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager'); - $center = $this->em->getRepository('ChillMainBundle:Center') + $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); $this->person = (new Person()) @@ -99,7 +99,7 @@ final class PersonControllerViewWithHiddenFieldsTest extends WebTestCase */ protected function refreshPerson() { - $this->person = $this->em->getRepository('ChillPersonBundle:Person') + $this->person = $this->em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($this->person->getId()); } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php index 3ebb63990..7f01d3c4b 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php @@ -27,7 +27,7 @@ final class PersonDuplicateControllerViewTest extends WebTestCase $this->em = self::$container ->get('doctrine.orm.entity_manager'); - $center = $this->em->getRepository('ChillMainBundle:Center') + $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); $this->person = (new Person()) diff --git a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php index 6a9e37531..c92de01c6 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php @@ -38,7 +38,7 @@ final class PickPersonTypeTest extends KernelTestCase self::bootKernel(); $this->user = self::$container->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:User') + ->getRepository(\Chill\MainBundle\Entity\User::class) ->findOneBy(['username' => 'multi_center']); $this->formFactory = self::$container->get('form.factory'); @@ -71,7 +71,7 @@ final class PickPersonTypeTest extends KernelTestCase { $this->markTestSkipped('need to inject locale into url generator without request'); $center = self::$container->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:Center') + ->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); $form = $this->formFactory @@ -104,7 +104,7 @@ final class PickPersonTypeTest extends KernelTestCase { $this->markTestSkipped('need to inject locale into url generator without request'); $centers = self::$container->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:Center') + ->getRepository(\Chill\MainBundle\Entity\Center::class) ->findAll(); $form = $this->formFactory diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php index 33ddd3a39..7f19b3434 100644 --- a/src/Bundle/ChillReportBundle/Controller/ReportController.php +++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php @@ -78,7 +78,7 @@ class ReportController extends AbstractController $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup') ->find($cf_group_id); - $person = $em->getRepository('ChillPersonBundle:Person') + $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($person_id); if (null === $person || null === $cFGroup) { @@ -212,7 +212,7 @@ class ReportController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id); + $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($person_id); $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person); @@ -269,7 +269,7 @@ class ReportController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id); + $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($person_id); $cFGroup = $em ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup') ->find($cf_group_id); @@ -317,7 +317,7 @@ class ReportController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $person = $em->getRepository('ChillPersonBundle:Person') + $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class) ->find($person_id); if (null === $person) { @@ -371,7 +371,7 @@ class ReportController extends AbstractController ]) ->getForm(); - $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id); + $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($person_id); return $this->render('ChillReportBundle:Report:select_report_type.html.twig', [ 'form' => $form->createView(), @@ -513,7 +513,7 @@ class ReportController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id); + $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($person_id); $entity = $em->getRepository('ChillReportBundle:Report')->find($report_id); diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php index 92984406c..f80645bc5 100644 --- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php @@ -46,7 +46,7 @@ final class ReportControllerNextTest extends WebTestCase ->get('doctrine.orm.entity_manager'); $this->person = $em - ->getRepository('ChillPersonBundle:Person') + ->getRepository(\Chill\PersonBundle\Entity\Person::class) ->findOneBy( [ 'lastName' => 'Charline', diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php index dfbf18503..70516c5be 100644 --- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php @@ -65,7 +65,7 @@ final class ReportControllerTest extends WebTestCase //get a random person self::$person = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager') - ->getRepository('ChillPersonBundle:Person') + ->getRepository(\Chill\PersonBundle\Entity\Person::class) ->findOneBy( [ 'lastName' => 'Charline', @@ -94,7 +94,7 @@ final class ReportControllerTest extends WebTestCase self::$user = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:User') + ->getRepository(\Chill\MainBundle\Entity\User::class) ->findOneBy(['username' => 'center a_social']); } diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php index 647c1ae96..1e6e5f946 100644 --- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php @@ -52,7 +52,7 @@ final class TimelineProviderTest extends WebTestCase self::$em = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager'); - $center = self::$em->getRepository('ChillMainBundle:Center') + $center = self::$em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findOneBy(['name' => 'Center A']); $person = (new Person(new DateTime('2015-05-01'))) @@ -71,7 +71,7 @@ final class TimelineProviderTest extends WebTestCase ); $report = (new Report()) - ->setUser(self::$em->getRepository('ChillMainBundle:User') + ->setUser(self::$em->getRepository(\Chill\MainBundle\Entity\User::class) ->findOneByUsername('center a_social')) ->setDate(new DateTime('2015-05-02')) ->setPerson($this->person) From 864e1eeabb493534a865bdf5d871da4809f94261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 00:35:11 +0200 Subject: [PATCH 118/132] replace more doctrine shortcuts by fqdn --- .../Tests/Controller/ActivityControllerTest.php | 5 +++-- .../Form/Type/TranslatableActivityTypeTest.php | 3 ++- .../Controller/ParticipationControllerTest.php | 2 +- .../Tests/Search/EventSearchTest.php | 2 +- .../Command/LoadAndUpdateLanguagesCommand.php | 3 ++- .../Command/LoadCountriesCommand.php | 3 ++- .../Controller/PermissionsGroupController.php | 16 ++++++++-------- .../Controller/ScopeController.php | 8 ++++---- .../Controller/UserController.php | 4 ++-- .../Form/Type/Select2CountryType.php | 5 +++-- .../Form/Type/Select2LanguageType.php | 5 +++-- .../Test/Export/AbstractExportTest.php | 2 +- .../Export/Export/ListPerson.php | 2 +- .../Controller/PersonAddressControllerTest.php | 2 +- .../Controller/PersonControllerUpdateTest.php | 2 +- ...ersonControllerUpdateWithHiddenFieldsTest.php | 2 +- .../Export/Export/ReportList.php | 2 +- .../Tests/Timeline/TimelineProviderTest.php | 2 +- .../migrations/Version20150622233319.php | 2 +- 19 files changed, 39 insertions(+), 33 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php index 55b2fb8c0..9fbbde980 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\ActivityBundle\Tests\Controller; +use Chill\ActivityBundle\Entity\ActivityType; use RuntimeException; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\Security\Core\Role\Role; @@ -209,7 +210,7 @@ final class ActivityControllerTest extends WebTestCase //get the social PermissionGroup, and remove CHILL_ACTIVITY_* $socialPermissionGroup = $em - ->getRepository('ChillMainBundle:PermissionsGroup') + ->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class) ->findOneByName('social'); $withoutActivityPermissionGroup = (new \Chill\MainBundle\Entity\PermissionsGroup()) ->setName('social without activity'); @@ -323,7 +324,7 @@ final class ActivityControllerTest extends WebTestCase { $types = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager') - ->getRepository('ChillActivityBundle:ActivityType') + ->getRepository(ActivityType::class) ->findAll(); return $types[array_rand($types)]; diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php index 68f206da2..7493bc5f4 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\ActivityBundle\Tests\Form\Type; +use Chill\ActivityBundle\Entity\ActivityType; use Chill\ActivityBundle\Form\Type\TranslatableActivityType; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Form\Extension\Core\Type\FormType; @@ -95,7 +96,7 @@ final class TranslatableActivityTypeTest extends KernelTestCase protected function getRandomType($active = true) { $types = $this->container->get('doctrine.orm.entity_manager') - ->getRepository('ChillActivityBundle:ActivityType') + ->getRepository(ActivityType::class) ->findBy(['active' => $active]); return $types[array_rand($types)]; diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php index aa14cf748..87b3b0ebe 100644 --- a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php +++ b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php @@ -456,7 +456,7 @@ final class ParticipationControllerTest extends WebTestCase $center = $this->em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findByName($centerName); - $circles = $this->em->getRepository('ChillMainBundle:Scope') + $circles = $this->em->getRepository(\Chill\MainBundle\Entity\Scope::class) ->findAll(); array_filter($circles, static function ($circle) use ($circleName) { return in_array($circleName, $circle->getName(), true); diff --git a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php index 837fbcade..bb93196fa 100644 --- a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php +++ b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php @@ -333,7 +333,7 @@ final class EventSearchTest extends WebTestCase */ protected function getCircle($name = 'social') { - $circles = $this->entityManager->getRepository('ChillMainBundle:Scope') + $circles = $this->entityManager->getRepository(\Chill\MainBundle\Entity\Scope::class) ->findAll(); /** @var \Chill\MainBundle\Entity\Scope $circle */ diff --git a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php index dd751db01..a32fd5d97 100644 --- a/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php +++ b/src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Command; +use Chill\MainBundle\Entity\Language; use Doctrine\ORM\EntityManager; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; @@ -113,7 +114,7 @@ class LoadAndUpdateLanguagesCommand extends Command ) ); - $langageDB = $em->getRepository('ChillMainBundle:Language')->find($code); + $langageDB = $em->getRepository(Language::class)->find($code); if (!$excludeCode) { if (!$langageDB) { diff --git a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php index b47146324..47bd93491 100644 --- a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php +++ b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Command; +use Chill\MainBundle\Entity\Country; use Doctrine\ORM\EntityManager; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; @@ -87,7 +88,7 @@ class LoadCountriesCommand extends Command $em = $this->entityManager; foreach ($countries as $country) { - $countryStored = $em->getRepository('ChillMainBundle:Country') + $countryStored = $em->getRepository(Country::class) ->findOneBy(['countryCode' => $country->getCountryCode()]); if (null === $countryStored) { diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php index 59b97a57c..216ef1f5c 100644 --- a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php +++ b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php @@ -87,7 +87,7 @@ class PermissionsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $permissionsGroup = $em->getRepository('ChillMainBundle:PermissionsGroup')->find($id); + $permissionsGroup = $em->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)->find($id); if (!$permissionsGroup) { throw $this->createNotFoundException('Unable to find PermissionsGroup entity.'); @@ -203,8 +203,8 @@ class PermissionsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $permissionsGroup = $em->getRepository('ChillMainBundle:PermissionsGroup')->find($pgid); - $roleScope = $em->getRepository('ChillMainBundle:RoleScope')->find($rsid); + $permissionsGroup = $em->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)->find($pgid); + $roleScope = $em->getRepository(\Chill\MainBundle\Entity\RoleScope::class)->find($rsid); if (!$permissionsGroup) { throw $this->createNotFoundException('Unable to find PermissionsGroup entity.'); @@ -269,7 +269,7 @@ class PermissionsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $permissionsGroup = $em->getRepository('ChillMainBundle:PermissionsGroup')->find($id); + $permissionsGroup = $em->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)->find($id); if (!$permissionsGroup) { throw $this->createNotFoundException('Unable to find PermissionsGroup entity.'); @@ -319,7 +319,7 @@ class PermissionsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entities = $em->getRepository('ChillMainBundle:PermissionsGroup')->findAll(); + $entities = $em->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)->findAll(); return $this->render('@ChillMain/PermissionsGroup/index.html.twig', [ 'entities' => $entities, @@ -349,7 +349,7 @@ class PermissionsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $permissionsGroup = $em->getRepository('ChillMainBundle:PermissionsGroup')->find($id); + $permissionsGroup = $em->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class)->find($id); if (!$permissionsGroup) { throw $this->createNotFoundException('Unable to find PermissionsGroup entity.'); @@ -405,7 +405,7 @@ class PermissionsGroupController extends AbstractController $em = $this->getDoctrine()->getManager(); $permissionsGroup = $em - ->getRepository('ChillMainBundle:PermissionsGroup') + ->getRepository(\Chill\MainBundle\Entity\PermissionsGroup::class) ->find($id); if (!$permissionsGroup) { @@ -469,7 +469,7 @@ class PermissionsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $roleScope = $em->getRepository('ChillMainBundle:RoleScope') + $roleScope = $em->getRepository(\Chill\MainBundle\Entity\RoleScope::class) ->findOneBy(['role' => $role, 'scope' => $scope]); if (null === $roleScope) { diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeController.php b/src/Bundle/ChillMainBundle/Controller/ScopeController.php index 07945c7fa..74ebc73a7 100644 --- a/src/Bundle/ChillMainBundle/Controller/ScopeController.php +++ b/src/Bundle/ChillMainBundle/Controller/ScopeController.php @@ -54,7 +54,7 @@ class ScopeController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $scope = $em->getRepository('ChillMainBundle:Scope')->find($id); + $scope = $em->getRepository(\Chill\MainBundle\Entity\Scope::class)->find($id); if (!$scope) { throw $this->createNotFoundException('Unable to find Scope entity.'); @@ -75,7 +75,7 @@ class ScopeController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entities = $em->getRepository('ChillMainBundle:Scope')->findAll(); + $entities = $em->getRepository(\Chill\MainBundle\Entity\Scope::class)->findAll(); return $this->render('@ChillMain/Scope/index.html.twig', [ 'entities' => $entities, @@ -105,7 +105,7 @@ class ScopeController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $scope = $em->getRepository('ChillMainBundle:Scope')->find($id); + $scope = $em->getRepository(\Chill\MainBundle\Entity\Scope::class)->find($id); if (!$scope) { throw $this->createNotFoundException('Unable to find Scope entity.'); @@ -125,7 +125,7 @@ class ScopeController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $scope = $em->getRepository('ChillMainBundle:Scope')->find($id); + $scope = $em->getRepository(\Chill\MainBundle\Entity\Scope::class)->find($id); if (!$scope) { throw $this->createNotFoundException('Unable to find Scope entity.'); diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php index 01e7ece26..61895eaa9 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserController.php @@ -124,7 +124,7 @@ class UserController extends CRUDController throw $this->createNotFoundException('Unable to find User entity.'); } - $groupCenter = $em->getRepository('ChillMainBundle:GroupCenter') + $groupCenter = $em->getRepository(\Chill\MainBundle\Entity\GroupCenter::class) ->find($gcid); if (!$groupCenter) { @@ -330,7 +330,7 @@ class UserController extends CRUDController { $em = $this->getDoctrine()->getManager(); - $groupCenterManaged = $em->getRepository('ChillMainBundle:GroupCenter') + $groupCenterManaged = $em->getRepository(\Chill\MainBundle\Entity\GroupCenter::class) ->findOneBy([ 'center' => $groupCenter->getCenter(), 'permissionsGroup' => $groupCenter->getPermissionsGroup(), diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php index d3374e9de..73cdeb075 100644 --- a/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php +++ b/src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Form\Type; +use Chill\MainBundle\Entity\Country; use Chill\MainBundle\Form\Type\DataTransformer\ObjectToIdTransformer; use Chill\MainBundle\Templating\TranslatableStringHelper; use Doctrine\Persistence\ObjectManager; @@ -50,13 +51,13 @@ class Select2CountryType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { - $transformer = new ObjectToIdTransformer($this->em, 'Chill\MainBundle\Entity\Country'); + $transformer = new ObjectToIdTransformer($this->em, Country::class); $builder->addModelTransformer($transformer); } public function configureOptions(OptionsResolver $resolver) { - $countries = $this->em->getRepository('Chill\MainBundle\Entity\Country')->findAll(); + $countries = $this->em->getRepository(Country::class)->findAll(); $choices = []; $preferredCountries = $this->parameterBag->get('chill_main.available_countries'); $preferredChoices = []; diff --git a/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php b/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php index 4c8e11a49..8e46f4508 100644 --- a/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php +++ b/src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Form\Type; +use Chill\MainBundle\Entity\Language; use Chill\MainBundle\Form\Type\DataTransformer\MultipleObjectsToIdTransformer; use Chill\MainBundle\Templating\TranslatableStringHelper; use Doctrine\Persistence\ObjectManager; @@ -50,13 +51,13 @@ class Select2LanguageType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { - $transformer = new MultipleObjectsToIdTransformer($this->em, 'Chill\MainBundle\Entity\Language'); + $transformer = new MultipleObjectsToIdTransformer($this->em, Language::class); $builder->addModelTransformer($transformer); } public function configureOptions(OptionsResolver $resolver) { - $languages = $this->em->getRepository('Chill\MainBundle\Entity\Language')->findAll(); + $languages = $this->em->getRepository(Language::class)->findAll(); $preferredLanguages = $this->parameterBag->get('chill_main.available_languages'); $choices = []; $preferredChoices = []; diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php index b4264140b..d7da05aa7 100644 --- a/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php +++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php @@ -85,7 +85,7 @@ abstract class AbstractExportTest extends WebTestCase $centers = $em->getRepository(\Chill\MainBundle\Entity\Center::class) ->findAll(); - $circles = $em->getRepository('ChillMainBundle:Scope') + $circles = $em->getRepository(\Chill\MainBundle\Entity\Scope::class) ->findAll(); if (count($centers) === 0) { diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php index 9f9c90da0..50b0f3d72 100644 --- a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php +++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php @@ -173,7 +173,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface case 'countryOfBirth': case 'nationality': $countryRepository = $this->entityManager - ->getRepository('ChillMainBundle:Country'); + ->getRepository(\Chill\MainBundle\Entity\Country::class); // load all countries in a single query $countryRepository->findBy(['countryCode' => $values]); diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php index 7691e9b49..7b483d8cd 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php @@ -70,7 +70,7 @@ final class PersonAddressControllerTest extends WebTestCase $this->em = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager'); - $this->postalCode = $this->em->getRepository('ChillMainBundle:PostalCode') + $this->postalCode = $this->em->getRepository(\Chill\MainBundle\Entity\PostalCode::class) ->findOneBy(['code' => 1000]); $this->client = self::createClient([], [ diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php index bb582232e..608a5bef5 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php @@ -192,7 +192,7 @@ final class PersonControllerUpdateTest extends WebTestCase case 'nationality': case 'countryOfBirth': if (false === empty($value)) { - $country = $this->em->getRepository('ChillMainBundle:Country') + $country = $this->em->getRepository(\Chill\MainBundle\Entity\Country::class) ->findOneByCountryCode($value); $transformedValue = $country->getId(); } else { diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php index 934eddc34..15ff6f116 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php @@ -126,7 +126,7 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase case 'nationality': case 'countryOfBirth': if (null !== $value) { - $country = $this->em->getRepository('ChillMainBundle:Country') + $country = $this->em->getRepository(\Chill\MainBundle\Entity\Country::class) ->findOneByCountryCode($value); $transformedValue = $country->getId(); } else { diff --git a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php index 61224bb39..b2b436485 100644 --- a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php +++ b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php @@ -246,7 +246,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface case 'person_countryOfBirth': case 'person_nationality': $countryRepository = $this->em - ->getRepository('ChillMainBundle:Country'); + ->getRepository(\Chill\MainBundle\Entity\Country::class); // load all countries in a single query $countryRepository->findBy(['countryCode' => $values]); diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php index 1e6e5f946..45f009a4f 100644 --- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php @@ -65,7 +65,7 @@ final class TimelineProviderTest extends WebTestCase $scopesSocial = array_filter( self::$em - ->getRepository('ChillMainBundle:Scope') + ->getRepository(\Chill\MainBundle\Entity\Scope::class) ->findAll(), static function (Scope $scope) { return $scope->getName()['en'] === 'social'; } ); diff --git a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php index 685906658..0bb50c9e1 100644 --- a/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php +++ b/src/Bundle/ChillReportBundle/migrations/Version20150622233319.php @@ -72,7 +72,7 @@ class Version20150622233319 extends AbstractMigration implements ContainerAwareI //add a default scope $scopes = $this->container->get('doctrine.orm.default_entity_manager') - ->getRepository('ChillMainBundle:Scope') + ->getRepository(\Chill\MainBundle\Entity\Scope::class) ->findAll(); if (count($scopes) > 0) { From 4b9b27a8efb27ccf40937f2be8466c2c6e3102ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 00:37:26 +0200 Subject: [PATCH 119/132] replace docrine shortcuts in activity bundle by fqdn --- .../Controller/ActivityReasonCategoryController.php | 8 ++++---- .../Controller/ActivityReasonController.php | 8 ++++---- .../Tests/Controller/ActivityControllerTest.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php index 3d5591b77..d367d5803 100644 --- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php +++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php @@ -54,7 +54,7 @@ class ActivityReasonCategoryController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id); + $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.'); @@ -75,7 +75,7 @@ class ActivityReasonCategoryController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll(); + $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll(); return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [ 'entities' => $entities, @@ -105,7 +105,7 @@ class ActivityReasonCategoryController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id); + $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.'); @@ -125,7 +125,7 @@ class ActivityReasonCategoryController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id); + $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.'); diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php index d69347ae9..ae213d578 100644 --- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php +++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php @@ -54,7 +54,7 @@ class ActivityReasonController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id); + $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find ActivityReason entity.'); @@ -75,7 +75,7 @@ class ActivityReasonController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll(); + $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->findAll(); return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [ 'entities' => $entities, @@ -105,7 +105,7 @@ class ActivityReasonController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id); + $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find ActivityReason entity.'); @@ -125,7 +125,7 @@ class ActivityReasonController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id); + $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find ActivityReason entity.'); diff --git a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php index 9fbbde980..43ce85778 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php @@ -305,7 +305,7 @@ final class ActivityControllerTest extends WebTestCase { $reasons = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager') - ->getRepository('ChillActivityBundle:ActivityReason') + ->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class) ->findAll(); $reason = $reasons[array_rand($reasons)]; From d0cc0e775f2d42e9ac68a7474919535ab60c8a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 00:39:17 +0200 Subject: [PATCH 120/132] replace fqdn in calendar bundle --- .../ChillCalendarBundle/Controller/CalendarController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php index 68640f3f4..ff34aaf45 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php @@ -81,7 +81,7 @@ class CalendarController extends AbstractController } /** @var Calendar $entity */ - $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id); + $entity = $em->getRepository(\Chill\CalendarBundle\Entity\Calendar::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Calendar entity.'); @@ -139,7 +139,7 @@ class CalendarController extends AbstractController $view = '@ChillCalendar/Calendar/editByUser.html.twig'; } - $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id); + $entity = $em->getRepository(\Chill\CalendarBundle\Entity\Calendar::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Calendar entity.'); @@ -314,7 +314,7 @@ class CalendarController extends AbstractController } /** @var Calendar $entity */ - $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id); + $entity = $em->getRepository(\Chill\CalendarBundle\Entity\Calendar::class)->find($id); if (null === $entity) { throw $this->createNotFoundException('Unable to find Calendar entity.'); From 6da19b01359567f15780d8947365c046473a1f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 00:42:03 +0200 Subject: [PATCH 121/132] replace fqdn in event bundle --- .../ChillEventBundle/Controller/EventController.php | 10 +++++----- .../Controller/EventTypeController.php | 10 +++++----- .../Controller/ParticipationController.php | 8 ++++---- .../ChillEventBundle/Controller/RoleController.php | 10 +++++----- .../ChillEventBundle/Controller/StatusController.php | 10 +++++----- .../Tests/Controller/ParticipationControllerTest.php | 8 ++++---- .../ChillEventBundle/Tests/Search/EventSearchTest.php | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php index a07d36ee1..0dcaf176a 100644 --- a/src/Bundle/ChillEventBundle/Controller/EventController.php +++ b/src/Bundle/ChillEventBundle/Controller/EventController.php @@ -97,7 +97,7 @@ class EventController extends AbstractController public function deleteAction($event_id, Request $request) { $em = $this->getDoctrine()->getManager(); - $event = $em->getRepository('ChillEventBundle:Event')->findOneBy([ + $event = $em->getRepository(\Chill\EventBundle\Entity\Event::class)->findOneBy([ 'id' => $event_id, ]); @@ -151,7 +151,7 @@ class EventController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:Event')->find($event_id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\Event::class)->find($event_id); if (!$entity) { throw $this->createNotFoundException('Unable to find Event entity.'); @@ -192,11 +192,11 @@ class EventController extends AbstractController $person->getCenter() ); - $total = $em->getRepository('ChillEventBundle:Participation')->countByPerson($person_id); + $total = $em->getRepository(\Chill\EventBundle\Entity\Participation::class)->countByPerson($person_id); $paginator = $this->paginator->create($total); - $participations = $em->getRepository('ChillEventBundle:Participation')->findByPersonInCircle( + $participations = $em->getRepository(\Chill\EventBundle\Entity\Participation::class)->findByPersonInCircle( $person_id, $reachablesCircles, $paginator->getCurrentPage()->getFirstItemNumber(), @@ -352,7 +352,7 @@ class EventController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:Event')->find($event_id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\Event::class)->find($event_id); if (!$entity) { throw $this->createNotFoundException('Unable to find Event entity.'); diff --git a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php index f1ced71a5..5db922dea 100644 --- a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php +++ b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php @@ -60,7 +60,7 @@ class EventTypeController extends AbstractController if ($form->isValid()) { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:EventType')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\EventType::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find EventType entity.'); @@ -82,7 +82,7 @@ class EventTypeController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:EventType')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\EventType::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find EventType entity.'); @@ -105,7 +105,7 @@ class EventTypeController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entities = $em->getRepository('ChillEventBundle:EventType')->findAll(); + $entities = $em->getRepository(\Chill\EventBundle\Entity\EventType::class)->findAll(); return $this->render('ChillEventBundle:EventType:index.html.twig', [ 'entities' => $entities, @@ -135,7 +135,7 @@ class EventTypeController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:EventType')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\EventType::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find EventType entity.'); @@ -158,7 +158,7 @@ class EventTypeController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:EventType')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\EventType::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find EventType entity.'); diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php index 52fe3d867..da1569d3c 100644 --- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php +++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php @@ -258,7 +258,7 @@ class ParticipationController extends AbstractController public function deleteAction($participation_id, Request $request) { $em = $this->getDoctrine()->getManager(); - $participation = $em->getRepository('ChillEventBundle:Participation')->findOneBy([ + $participation = $em->getRepository(\Chill\EventBundle\Entity\Participation::class)->findOneBy([ 'id' => $participation_id, ]); @@ -336,7 +336,7 @@ class ParticipationController extends AbstractController */ public function editMultipleAction($event_id) { - $event = $this->getDoctrine()->getRepository('ChillEventBundle:Event') + $event = $this->getDoctrine()->getRepository(\Chill\EventBundle\Entity\Event::class) ->find($event_id); if (null === $event) { @@ -467,7 +467,7 @@ class ParticipationController extends AbstractController public function updateMultipleAction($event_id, Request $request) { /** @var \Chill\EventBundle\Entity\Event $event */ - $event = $this->getDoctrine()->getRepository('ChillEventBundle:Event') + $event = $this->getDoctrine()->getRepository(\Chill\EventBundle\Entity\Event::class) ->find($event_id); if (null === $event) { @@ -569,7 +569,7 @@ class ParticipationController extends AbstractController // prevent error: `Argument 2 passed to ::getInt() must be of the type int, null given` if (null !== $event_id) { - $event = $em->getRepository('ChillEventBundle:Event') + $event = $em->getRepository(\Chill\EventBundle\Entity\Event::class) ->find($event_id); if (null === $event) { diff --git a/src/Bundle/ChillEventBundle/Controller/RoleController.php b/src/Bundle/ChillEventBundle/Controller/RoleController.php index a12a775da..8bf8affbd 100644 --- a/src/Bundle/ChillEventBundle/Controller/RoleController.php +++ b/src/Bundle/ChillEventBundle/Controller/RoleController.php @@ -60,7 +60,7 @@ class RoleController extends AbstractController if ($form->isValid()) { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:Role')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\Role::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Role entity.'); @@ -82,7 +82,7 @@ class RoleController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:Role')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\Role::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Role entity.'); @@ -105,7 +105,7 @@ class RoleController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entities = $em->getRepository('ChillEventBundle:Role')->findAll(); + $entities = $em->getRepository(\Chill\EventBundle\Entity\Role::class)->findAll(); return $this->render('ChillEventBundle:Role:index.html.twig', [ 'entities' => $entities, @@ -135,7 +135,7 @@ class RoleController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:Role')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\Role::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Role entity.'); @@ -158,7 +158,7 @@ class RoleController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:Role')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\Role::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Role entity.'); diff --git a/src/Bundle/ChillEventBundle/Controller/StatusController.php b/src/Bundle/ChillEventBundle/Controller/StatusController.php index 72e80b27b..40f92cba4 100644 --- a/src/Bundle/ChillEventBundle/Controller/StatusController.php +++ b/src/Bundle/ChillEventBundle/Controller/StatusController.php @@ -57,7 +57,7 @@ class StatusController extends AbstractController if ($form->isValid()) { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:Status')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\Status::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Status entity.'); @@ -79,7 +79,7 @@ class StatusController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:Status')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\Status::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Status entity.'); @@ -102,7 +102,7 @@ class StatusController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entities = $em->getRepository('ChillEventBundle:Status')->findAll(); + $entities = $em->getRepository(\Chill\EventBundle\Entity\Status::class)->findAll(); return $this->render('ChillEventBundle:Status:index.html.twig', [ 'entities' => $entities, @@ -132,7 +132,7 @@ class StatusController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:Status')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\Status::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Status entity.'); @@ -155,7 +155,7 @@ class StatusController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillEventBundle:Status')->find($id); + $entity = $em->getRepository(\Chill\EventBundle\Entity\Status::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Status entity.'); diff --git a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php index 87b3b0ebe..d81c6f9c8 100644 --- a/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php +++ b/src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php @@ -292,7 +292,7 @@ final class ParticipationControllerTest extends WebTestCase $this->assertGreaterThan(0, count($span2)); // as the container has reloaded, reload the event - $event = $this->em->getRepository('ChillEventBundle:Event')->find($event->getId()); + $event = $this->em->getRepository(\Chill\EventBundle\Entity\Event::class)->find($event->getId()); $this->em->refresh($event); $this->assertEquals($nbParticipations + 2, $event->getParticipations()->count()); @@ -388,7 +388,7 @@ final class ParticipationControllerTest extends WebTestCase $this->assertTrue($this->client->getResponse()->isRedirect()); // reload the event and test there is a new participation - $event = $this->em->getRepository('ChillEventBundle:Event') + $event = $this->em->getRepository(\Chill\EventBundle\Entity\Event::class) ->find($event->getId()); $this->em->refresh($event); @@ -439,7 +439,7 @@ final class ParticipationControllerTest extends WebTestCase $this->assertGreaterThan(0, count($span)); // as the container has reloaded, reload the event - $event = $this->em->getRepository('ChillEventBundle:Event')->find($event->getId()); + $event = $this->em->getRepository(\Chill\EventBundle\Entity\Event::class)->find($event->getId()); $this->em->refresh($event); $this->assertEquals($nbParticipations + 1, $event->getParticipations()->count()); @@ -463,7 +463,7 @@ final class ParticipationControllerTest extends WebTestCase }); $circle = $circles[0]; - $events = $this->em->getRepository('ChillEventBundle:Event') + $events = $this->em->getRepository(\Chill\EventBundle\Entity\Event::class) ->findBy(['center' => $center, 'circle' => $circle]); return $events[array_rand($events)]; diff --git a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php index bb93196fa..f8565b5e8 100644 --- a/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php +++ b/src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php @@ -90,7 +90,7 @@ final class EventSearchTest extends WebTestCase ->findOneBy(['name' => 'Center A']); $this->eventType = $this->entityManager - ->getRepository('ChillEventBundle:EventType') + ->getRepository(\Chill\EventBundle\Entity\EventType::class) ->findAll()[0]; $this->createEvents(); From f26d50a3a88e56638ef3015bdb7ec7bb296bd2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 00:46:48 +0200 Subject: [PATCH 122/132] replace fqdn in customfields bundle --- .../Command/CreateFieldsOnGroupCommand.php | 2 +- .../Controller/CustomFieldController.php | 2 +- .../Controller/CustomFieldsGroupController.php | 14 +++++++------- .../JsonCustomFieldToArrayTransformer.php | 3 +++ .../Controller/PersonController.php | 2 +- .../ChillPersonBundle/Widget/PersonListWidget.php | 2 +- .../Controller/ReportController.php | 10 +++++----- .../Tests/Controller/ReportControllerNextTest.php | 2 +- .../Tests/Controller/ReportControllerTest.php | 2 +- .../Tests/Timeline/TimelineProviderTest.php | 2 +- 10 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php index a20157ce0..7454ba6cf 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php +++ b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php @@ -119,7 +119,7 @@ class CreateFieldsOnGroupCommand extends Command $em = $this->entityManager; $customFieldsGroups = $em - ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup') + ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class) ->findAll(); if (count($customFieldsGroups) === 0) { diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php index 4ec9a8c67..7fae79016 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php +++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php @@ -138,7 +138,7 @@ class CustomFieldController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillCustomFieldsBundle:CustomField')->find($id); + $entity = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomField::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find CustomField entity.'); diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php index 5398c5f38..68d9fb8ec 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php +++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php @@ -92,7 +92,7 @@ class CustomFieldsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id); + $entity = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find CustomFieldsGroup entity.'); @@ -113,7 +113,7 @@ class CustomFieldsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $cfGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->findAll(); + $cfGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->findAll(); $defaultGroups = $this->getDefaultGroupsId(); $makeDefaultFormViews = []; @@ -143,7 +143,7 @@ class CustomFieldsGroupController extends AbstractController $em = $this->getDoctrine()->getManager(); - $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->findOneById($cFGroupId); + $cFGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->findOneById($cFGroupId); if (!$cFGroup) { throw $this @@ -151,7 +151,7 @@ class CustomFieldsGroupController extends AbstractController . "id {$cFGroupId}"); } - $cFDefaultGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsDefaultGroup') + $cFDefaultGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup::class) ->findOneByEntity($cFGroup->getEntity()); if ($cFDefaultGroup) { @@ -204,7 +204,7 @@ class CustomFieldsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id); + $entity = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find CustomFieldsGroups entity.'); @@ -248,7 +248,7 @@ class CustomFieldsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id); + $entity = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find CustomFieldsGroup entity.'); @@ -272,7 +272,7 @@ class CustomFieldsGroupController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id); + $entity = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find CustomFieldsGroup entity.'); diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php index 250418581..f8095018a 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php +++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php @@ -19,6 +19,9 @@ use function array_key_exists; use const JSON_THROW_ON_ERROR; +/** + * Not in use ? Deprecated ? + */ class JsonCustomFieldToArrayTransformer implements DataTransformerInterface { private array $customField; diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php index 22d3d9388..bd53cd8b3 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php @@ -156,7 +156,7 @@ final class PersonController extends AbstractController { $cFGroup = null; - $cFDefaultGroup = $this->em->getRepository('ChillCustomFieldsBundle:CustomFieldsDefaultGroup') + $cFDefaultGroup = $this->em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup::class) ->findOneByEntity('Chill\\PersonBundle\\Entity\\Person'); if ($cFDefaultGroup) { diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php index d3763a905..9e2f326fb 100644 --- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php +++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php @@ -133,7 +133,7 @@ class PersonListWidget implements WidgetInterface if (isset($config['custom_fields'])) { if (count($config['custom_fields']) > 0) { $cfs = $this->entityManager - ->getRepository('ChillCustomFieldsBundle:CustomField') + ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomField::class) ->findBy(['slug' => $config['custom_fields']]); // store the custom fields in a array foreach ($cfs as $cf) { diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php index 7f19b3434..e322fb791 100644 --- a/src/Bundle/ChillReportBundle/Controller/ReportController.php +++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php @@ -75,7 +75,7 @@ class ReportController extends AbstractController $em = $this->getDoctrine()->getManager(); $entity = new Report(); - $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup') + $cFGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class) ->find($cf_group_id); $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class) @@ -186,7 +186,7 @@ class ReportController extends AbstractController { $em = $this->getDoctrine()->getManager(); - $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($cf_group_id); + $cFGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->find($cf_group_id); $reports = $em->getRepository('ChillReportBundle:Report')->findByCFGroup($cFGroup); $response = $this->render('ChillReportBundle:Report:export.csv.twig', [ @@ -271,7 +271,7 @@ class ReportController extends AbstractController $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($person_id); $cFGroup = $em - ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup') + ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class) ->find($cf_group_id); if (null === $person) { @@ -343,7 +343,7 @@ class ReportController extends AbstractController ); } - $cFGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup') + $cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class) ->findByEntity('Chill\ReportBundle\Entity\Report'); if (count($cFGroups) === 1) { @@ -402,7 +402,7 @@ class ReportController extends AbstractController $em = $this->getDoctrine()->getManager(); - $cFGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup') + $cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class) ->findByEntity('Chill\ReportBundle\Entity\Report'); if (count($cFGroups) === 1) { diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php index f80645bc5..f25b639be 100644 --- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php @@ -63,7 +63,7 @@ final class ReportControllerNextTest extends WebTestCase // get custom fields group from fixture $customFieldsGroups = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager') - ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup') + ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class) ->findBy(['entity' => 'Chill\ReportBundle\Entity\Report']); //filter customFieldsGroup to get only "situation de logement" $filteredCustomFieldsGroupHouse = array_filter( diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php index 70516c5be..cc93214f3 100644 --- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php @@ -81,7 +81,7 @@ final class ReportControllerTest extends WebTestCase $customFieldsGroups = self::$kernel->getContainer() ->get('doctrine.orm.entity_manager') - ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup') + ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class) ->findBy(['entity' => 'Chill\ReportBundle\Entity\Report']); //filter customFieldsGroup to get only "situation de logement" $filteredCustomFieldsGroupHouse = array_filter( diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php index 45f009a4f..4fcac191b 100644 --- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php @@ -180,7 +180,7 @@ final class TimelineProviderTest extends WebTestCase private function getHousingCustomFieldsGroup() { $groups = self::$em - ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup') + ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class) ->findAll(); foreach ($groups as $group) { From 27e74014cec546c209be0ca03eb03e4c407c4bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 00:48:38 +0200 Subject: [PATCH 123/132] replace fqdn in docstore bundle --- .../Controller/DocumentCategoryController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php index a6147c4cd..a15854509 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php @@ -35,7 +35,7 @@ class DocumentCategoryController extends AbstractController { $em = $this->getDoctrine()->getManager(); $documentCategory = $em - ->getRepository('ChillDocStoreBundle:DocumentCategory') + ->getRepository(\Chill\DocStoreBundle\Entity\DocumentCategory::class) ->findOneBy( ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle] ); @@ -58,7 +58,7 @@ class DocumentCategoryController extends AbstractController { $em = $this->getDoctrine()->getManager(); $documentCategory = $em - ->getRepository('ChillDocStoreBundle:DocumentCategory') + ->getRepository(\Chill\DocStoreBundle\Entity\DocumentCategory::class) ->findOneBy( ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle] ); @@ -138,7 +138,7 @@ class DocumentCategoryController extends AbstractController { $em = $this->getDoctrine()->getManager(); $documentCategory = $em - ->getRepository('ChillDocStoreBundle:DocumentCategory') + ->getRepository(\Chill\DocStoreBundle\Entity\DocumentCategory::class) ->findOneBy( ['bundleId' => $bundleId, 'idInsideBundle' => $idInsideBundle] ); From 472bc3f35deec36f7e2e214aa58fe78866cbef54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 00:55:40 +0200 Subject: [PATCH 124/132] add missing keys to blank docgen person normalization --- .../Serializer/Normalizer/PersonDocGenNormalizer.php | 3 ++- .../Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php index 22ce96ab7..7d9813ce4 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php @@ -245,6 +245,7 @@ class PersonDocGenNormalizer implements 'deathdate' => DateTimeInterface::class, 'gender', 'maritalStatus', 'maritalStatusDate' => DateTimeInterface::class, + 'maritalStatusComment', 'email', 'firstPhoneNumber', 'fixPhoneNumber', 'mobilePhoneNumber', 'nationality', 'placeOfBirth', 'memo', 'numberOfChildren', 'address' => Address::class, @@ -256,7 +257,7 @@ class PersonDocGenNormalizer implements $data = $normalizer->normalize($attributes, $format, $context); - //$data['resources'] = []; + $data['resources'] = []; if ($context['docgen:person:with-relations'] ?? false) { $data['relations'] = []; diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php index deef94525..c5e3c7311 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php @@ -53,6 +53,7 @@ final class PersonDocGenNormalizerTest extends KernelTestCase 'address' => '@ignored', 'maritalStatus' => '', 'maritalStatusDate' => ['short' => '', 'long' => ''], + 'maritalStatusComment' => '', 'email' => '', 'firstPhoneNumber' => '', 'fixPhoneNumber' => '', @@ -62,6 +63,7 @@ final class PersonDocGenNormalizerTest extends KernelTestCase 'memo' => '', 'numberOfChildren' => '', 'age' => '@ignored', + 'resources' => [], ]; private NormalizerInterface $normalizer; From 3f63bc803d14ba3361df7493e7d200c4c698875f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 01:03:35 +0200 Subject: [PATCH 125/132] desactivate test whilpage is not working --- .../Tests/Timeline/TimelineAccompanyingPeriodTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php index 39898ed5c..9e602ea90 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php @@ -63,6 +63,8 @@ final class TimelineAccompanyingPeriodTest extends WebTestCase */ public function testEntriesAreShown($personId) { + $this->markTestSkipped('page does not work'); + $client = $this->getClientAuthenticated(); $crawler = $client->request('GET', "/en/person/{$personId}/timeline"); From dae383dbd93d18e6c80fb5585c612d2778b53dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 01:34:23 +0200 Subject: [PATCH 126/132] fix some psalm errors --- .gitignore | 1 + psalm.xml | 12 ++++++++++++ .../ChillBudgetBundle/Menu/HouseholdMenuBuilder.php | 1 + .../ChillBudgetBundle/Menu/PersonMenuBuilder.php | 1 + .../Repository/FamilyMemberRepository.php | 4 ++-- .../Entity/Workflow/EntityWorkflowStep.php | 2 ++ .../ChillPersonBundle/Entity/AccompanyingPeriod.php | 2 -- src/Bundle/ChillPersonBundle/Entity/Person.php | 4 ++-- .../Tests/Entity/AccompanyingPeriodTest.php | 8 ++++++-- .../RelationshipNoDuplicateValidator.php | 12 +++++++++--- 10 files changed, 36 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index aeec2c4b5..d0a16a46a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ docs/build/ /.php-cs-fixer.cache /.idea/ +/.psalm/ diff --git a/psalm.xml b/psalm.xml index be17d1d86..40e5d78e8 100644 --- a/psalm.xml +++ b/psalm.xml @@ -6,6 +6,7 @@ xmlns="https://getpsalm.org/schema/config" xsi:schemaLocation="https://getpsalm.org/schema/config tests/app/vendor/vimeo/psalm/config.xsd" errorBaseline="psalm-baseline.xml" + cacheDirectory="./.psalm" > @@ -13,4 +14,15 @@ + + + + + + + + + + + diff --git a/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php index f8033da7d..f9f295e17 100644 --- a/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php +++ b/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php @@ -13,6 +13,7 @@ namespace Chill\BudgetBundle\Menu; use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter; use Chill\MainBundle\Routing\LocalMenuBuilderInterface; +use Chill\PersonBundle\Entity\Household\Household; use Knp\Menu\MenuItem; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php index fdd38ac08..db2f66d6a 100644 --- a/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php +++ b/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php @@ -13,6 +13,7 @@ namespace Chill\BudgetBundle\Menu; use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter; use Chill\MainBundle\Routing\LocalMenuBuilderInterface; +use Chill\PersonBundle\Entity\Person; use Knp\Menu\MenuItem; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php b/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php index 571e94161..db3e2c727 100644 --- a/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php +++ b/src/Bundle/ChillFamilyMembersBundle/Repository/FamilyMemberRepository.php @@ -9,9 +9,9 @@ declare(strict_types=1); -namespace Chill\AMLI\FamilyMembersBundle\Repository; +namespace Chill\FamilyMembersBundle\Repository; -use Chill\AMLI\FamilyMembersBundle\Entity\FamilyMember; +use Chill\FamilyMembersBundle\Entity\FamilyMember; use Chill\PersonBundle\Entity\Person; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php index b978173d9..2207b224a 100644 --- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php +++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php @@ -160,6 +160,8 @@ class EntityWorkflowStep /** * get all the users which are allowed to apply a transition: those added manually, and * those added automatically bu using an access key. + * + * @psalm-suppress DuplicateArrayKey */ public function getAllDestUser(): Collection { diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index 8495afa89..e8108bcce 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php @@ -553,8 +553,6 @@ class AccompanyingPeriod implements * 'now'. * * @param mixed $person - * - * @return void */ public function closeParticipationFor($person): ?AccompanyingPeriodParticipation { diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index 7f2630a1e..3df55d904 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -880,7 +880,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI } /** - * @return Collection|BudgetCharges[] + * @return Collection|Charge[] */ public function getBudgetCharges(): Collection { @@ -888,7 +888,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI } /** - * @return Collection|BudgetResources[] + * @return Collection|Resource[] */ public function getBudgetResources(): Collection { diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php index 542144bc2..0fcf414ce 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php @@ -181,8 +181,12 @@ final class AccompanyingPeriodTest extends \PHPUnit\Framework\TestCase $this->assertEquals(1, $participations->count()); $participationL = $period->closeParticipationFor($person); - $this->assertSame($participationL, $participation); - $this->assertTrue($participationL->getEndDate() instanceof DateTimeInterface); + $this->assertNotNull($participationL); + + if ($participationL instanceof AccompanyingPeriodParticipation) { + $this->assertSame($participationL, $participation); + $this->assertTrue($participationL->getEndDate() instanceof DateTimeInterface); + } $participation = $period->getOpenParticipationContainsPerson($person); $this->assertNull($participation); diff --git a/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php b/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php index 580fc4b48..9c71f442d 100644 --- a/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php +++ b/src/Bundle/ChillPersonBundle/Validator/Constraints/Relationship/RelationshipNoDuplicateValidator.php @@ -11,10 +11,12 @@ declare(strict_types=1); namespace Chill\PersonBundle\Validator\Constraints\Relationship; +use Chill\PersonBundle\Entity\Relationships\Relationship; use Chill\PersonBundle\Repository\Relationships\RelationshipRepository; use Symfony\Component\Form\Exception\UnexpectedTypeException; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; +use Symfony\Component\Validator\Exception\UnexpectedValueException; class RelationshipNoDuplicateValidator extends ConstraintValidator { @@ -25,14 +27,18 @@ class RelationshipNoDuplicateValidator extends ConstraintValidator $this->relationshipRepository = $relationshipRepository; } - public function validate($relationship, Constraint $constraint) + public function validate($value, Constraint $constraint) { if (!$constraint instanceof RelationshipNoDuplicate) { throw new UnexpectedTypeException($constraint, RelationshipNoDuplicate::class); } - $fromPerson = $relationship->getFromPerson(); - $toPerson = $relationship->getToPerson(); + if (!$value instanceof Relationship) { + throw new UnexpectedValueException($value, Relationship::class); + } + + $fromPerson = $value->getFromPerson(); + $toPerson = $value->getToPerson(); $relationships = $this->relationshipRepository->findBy([ 'fromPerson' => [$fromPerson, $toPerson], From 304c734f9b31d67d9d4712be4c12db50739efca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 30 Apr 2022 01:44:53 +0200 Subject: [PATCH 127/132] delete unused test fixtures app --- .../test/Fixtures/App/app/AppKernel.php | 55 - .../App/app/DoctrineMigrations/.gitignore | 2 - .../CustomField/simple_form_render.html.twig | 7 - .../App/app/Resources/views/base.html.twig | 14 - .../test/Fixtures/App/app/autoload.php | 20 - .../test/Fixtures/App/app/config/config.yml | 76 - .../Fixtures/App/app/config/config_dev.yml | 11 - .../Fixtures/App/app/config/config_test.yml | 8 - ...mizable_entities_test_not_empty_config.yml | 9 - .../App/app/config/parameters.gitlab-ci.yml | 7 - .../App/app/config/parameters.yml.dist | 7 - .../test/Fixtures/App/app/config/routing.yml | 10 - .../Resources/test/Fixtures/App/app/console | 27 - .../Resources/test/Fixtures/App/logs/empty | 0 .../test/Fixtures/App/web/app_dev.php | 41 - .../Resources/test/Fixtures/App/AppKernel.php | 55 - .../test/Fixtures/App/config/config.yml | 43 - .../test/Fixtures/App/config/config_test.yml | 52 - .../App/config/parameters.gitlab-ci.yml | 11 - .../test/Fixtures/App/config/parameters.yml | 11 - .../Fixtures/App/config/parameters.yml.dist | 11 - .../test/Fixtures/App/config/routing.yml | 4 - .../Resources/test/Fixtures/App/console | 27 - .../Resources/test/bootstrap.php | 16 - .../test/Fixtures/App/app/AppKernel.php | 54 - .../App/app/DoctrineMigrations/.gitignore | 2 - .../test/Fixtures/App/app/autoload.php | 20 - .../test/Fixtures/App/app/config/config.yml | 42 - .../Fixtures/App/app/config/config_test.yml | 51 - .../App/app/config/parameters.gitlab-ci.yml | 11 - .../App/app/config/parameters.yml.dist | 11 - .../test/Fixtures/App/app/config/routing.yml | 34 - .../Resources/test/Fixtures/App/app/console | 27 - .../test/Fixtures/App/app/AppKernel.php | 55 - .../App/app/DoctrineMigrations/.gitignore | 2 - .../App/app/Resources/views/base.html.twig | 13 - .../test/Fixtures/App/app/autoload.php | 20 - .../test/Fixtures/App/app/config/config.yml | 76 - .../Fixtures/App/app/config/config_dev.yml | 7 - .../Fixtures/App/app/config/config_test.yml | 8 - .../config/config_test_with_hidden_fields.yml | 19 - .../App/app/config/parameters.gitlab-ci.yml | 7 - .../App/app/config/parameters.yml.dist | 7 - .../test/Fixtures/App/app/config/routing.yml | 4 - .../Resources/test/Fixtures/App/app/console | 27 - .../Resources/test/Fixtures/App/logs/empty | 0 .../test/Fixtures/App/web/app_dev.php | 41 - .../App/web/bundles/chillmain/CONTRIBUTING.md | 107 - .../App/web/bundles/chillmain/LICENSE | 18 - .../App/web/bundles/chillmain/README.md | 114 - .../App/web/bundles/chillmain/bower.json | 8 - .../App/web/bundles/chillmain/component.json | 66 - .../App/web/bundles/chillmain/composer.json | 29 - .../App/web/bundles/chillmain/css/admin.css | 2 - .../web/bundles/chillmain/css/chillmain.css | 25 - .../App/web/bundles/chillmain/css/gumby.css | 2617 ----- .../App/web/bundles/chillmain/css/pikaday.css | 173 - .../bundles/chillmain/fonts/FontAwesome.otf | Bin 85908 -> 0 bytes .../MerriweatherSans-Bold.ttf | Bin 51068 -> 0 bytes .../MerriweatherSans-BoldItalic.ttf | Bin 47572 -> 0 bytes .../MerriweatherSans-ExtraBold.ttf | Bin 50968 -> 0 bytes .../MerriweatherSans-ExtraBoldItalic.ttf | Bin 47668 -> 0 bytes .../MerriweatherSans-Italic.ttf | Bin 47560 -> 0 bytes .../MerriweatherSans-Light.ttf | Bin 47112 -> 0 bytes .../MerriweatherSans-LightItalic.ttf | Bin 47888 -> 0 bytes .../MerriweatherSans-Regular.ttf | Bin 48528 -> 0 bytes .../chillmain/fonts/Merriweather_Sans/OFL.txt | 94 - .../bundles/chillmain/fonts/Oxygen/OFL.txt | 92 - .../chillmain/fonts/Oxygen/Oxygen-Bold.ttf | Bin 48812 -> 0 bytes .../chillmain/fonts/Oxygen/Oxygen-Light.ttf | Bin 43852 -> 0 bytes .../chillmain/fonts/Oxygen/Oxygen-Regular.ttf | Bin 48092 -> 0 bytes .../chillmain/fonts/Oxygen_Mono/OFL.txt | 92 - .../fonts/Oxygen_Mono/OxygenMono-Regular.ttf | Bin 68940 -> 0 bytes .../chillmain/fonts/fontawesome-webfont.eot | Bin 56006 -> 0 bytes .../chillmain/fonts/fontawesome-webfont.svg | 520 - .../chillmain/fonts/fontawesome-webfont.ttf | Bin 112160 -> 0 bytes .../chillmain/fonts/fontawesome-webfont.woff | Bin 65452 -> 0 bytes .../MerriweatherSans-Bold.ttf | Bin 51068 -> 0 bytes .../MerriweatherSans-BoldItalic.ttf | Bin 47572 -> 0 bytes .../MerriweatherSans-ExtraBold.ttf | Bin 50968 -> 0 bytes .../MerriweatherSans-ExtraBoldItalic.ttf | Bin 47668 -> 0 bytes .../MerriweatherSans-Italic.ttf | Bin 47560 -> 0 bytes .../MerriweatherSans-Light.ttf | Bin 47112 -> 0 bytes .../MerriweatherSans-LightItalic.ttf | Bin 47888 -> 0 bytes .../MerriweatherSans-Regular.ttf | Bin 48528 -> 0 bytes .../fonts/icons/Merriweather_Sans/OFL.txt | 94 - .../chillmain/fonts/icons/Oxygen/OFL.txt | 92 - .../fonts/icons/Oxygen/Oxygen-Bold.ttf | Bin 48812 -> 0 bytes .../fonts/icons/Oxygen/Oxygen-Light.ttf | Bin 43852 -> 0 bytes .../fonts/icons/Oxygen/Oxygen-Regular.ttf | Bin 48092 -> 0 bytes .../chillmain/fonts/icons/Oxygen_Mono/OFL.txt | 92 - .../icons/Oxygen_Mono/OxygenMono-Regular.ttf | Bin 68940 -> 0 bytes .../bundles/chillmain/fonts/icons/entypo.eot | Bin 76038 -> 0 bytes .../bundles/chillmain/fonts/icons/entypo.ttf | Bin 75800 -> 0 bytes .../bundles/chillmain/fonts/icons/entypo.woff | Bin 45152 -> 0 bytes .../App/web/bundles/chillmain/js/jquery.js | 9190 ----------------- .../chillmain/js/modernizr-2.6.2.min.js | 4 - .../App/web/bundles/chillmain/moment.js | 2936 ------ .../App/web/bundles/chillmain/package.json | 20 - .../App/web/bundles/chillmain/pikaday.js | 920 -- .../chillmain/plugins/pikaday.jquery.js | 52 - .../App/web/bundles/chillmain/release.sh | 79 - .../bundles/chillmain/select2-bootstrap.css | 87 - .../web/bundles/chillmain/select2-spinner.gif | Bin 1849 -> 0 bytes .../App/web/bundles/chillmain/select2.css | 704 -- .../web/bundles/chillmain/select2.jquery.json | 36 - .../App/web/bundles/chillmain/select2.js | 3541 ------- .../App/web/bundles/chillmain/select2.min.js | 23 - .../App/web/bundles/chillmain/select2.png | Bin 613 -> 0 bytes .../bundles/chillmain/select2_locale_ar.js | 19 - .../bundles/chillmain/select2_locale_az.js | 20 - .../bundles/chillmain/select2_locale_bg.js | 20 - .../bundles/chillmain/select2_locale_ca.js | 19 - .../bundles/chillmain/select2_locale_cs.js | 51 - .../bundles/chillmain/select2_locale_da.js | 19 - .../bundles/chillmain/select2_locale_de.js | 18 - .../bundles/chillmain/select2_locale_el.js | 19 - .../chillmain/select2_locale_en.js.template | 20 - .../bundles/chillmain/select2_locale_es.js | 19 - .../bundles/chillmain/select2_locale_et.js | 19 - .../bundles/chillmain/select2_locale_eu.js | 45 - .../bundles/chillmain/select2_locale_fa.js | 21 - .../bundles/chillmain/select2_locale_fi.js | 30 - .../bundles/chillmain/select2_locale_fr.js | 18 - .../bundles/chillmain/select2_locale_gl.js | 45 - .../bundles/chillmain/select2_locale_he.js | 19 - .../bundles/chillmain/select2_locale_hr.js | 24 - .../bundles/chillmain/select2_locale_hu.js | 17 - .../bundles/chillmain/select2_locale_id.js | 19 - .../bundles/chillmain/select2_locale_is.js | 17 - .../bundles/chillmain/select2_locale_it.js | 17 - .../bundles/chillmain/select2_locale_ja.js | 17 - .../bundles/chillmain/select2_locale_ka.js | 19 - .../bundles/chillmain/select2_locale_ko.js | 19 - .../bundles/chillmain/select2_locale_lt.js | 26 - .../bundles/chillmain/select2_locale_lv.js | 19 - .../bundles/chillmain/select2_locale_mk.js | 19 - .../bundles/chillmain/select2_locale_ms.js | 19 - .../bundles/chillmain/select2_locale_nb.js | 22 - .../bundles/chillmain/select2_locale_nl.js | 17 - .../bundles/chillmain/select2_locale_pl.js | 54 - .../bundles/chillmain/select2_locale_pt-BR.js | 18 - .../bundles/chillmain/select2_locale_pt-PT.js | 17 - .../bundles/chillmain/select2_locale_ro.js | 17 - .../bundles/chillmain/select2_locale_rs.js | 19 - .../bundles/chillmain/select2_locale_ru.js | 23 - .../bundles/chillmain/select2_locale_sk.js | 50 - .../bundles/chillmain/select2_locale_sv.js | 19 - .../bundles/chillmain/select2_locale_th.js | 19 - .../bundles/chillmain/select2_locale_tr.js | 19 - .../bundles/chillmain/select2_locale_ug-CN.js | 16 - .../bundles/chillmain/select2_locale_uk.js | 25 - .../bundles/chillmain/select2_locale_vi.js | 20 - .../bundles/chillmain/select2_locale_zh-CN.js | 16 - .../bundles/chillmain/select2_locale_zh-TW.js | 16 - .../App/web/bundles/chillmain/select2x2.png | Bin 845 -> 0 bytes .../chillmain/stylesheets/sass/_custom.scss | 67 - .../bundles/chillmain/stylesheets/scratch.css | 3799 ------- .../chillmain/stylesheets/scratch.css.map | 7 - .../App/web/bundles/framework/css/body.css | 137 - .../web/bundles/framework/css/exception.css | 113 - .../web/bundles/framework/css/structure.css | 68 - .../framework/images/blue_picto_less.gif | Bin 197 -> 0 bytes .../framework/images/blue_picto_more.gif | Bin 213 -> 0 bytes .../framework/images/grey_magnifier.png | Bin 393 -> 0 bytes .../bundles/framework/images/logo_symfony.png | Bin 1459 -> 0 bytes .../test/Fixtures/App/app/AppKernel.php | 55 - .../App/app/DoctrineMigrations/.gitignore | 2 - .../test/Fixtures/App/app/autoload.php | 20 - .../test/Fixtures/App/app/bootstrap.php.cache | 1362 --- .../test/Fixtures/App/app/config/config.yml | 73 - .../Fixtures/App/app/config/config_dev.yml | 7 - .../Fixtures/App/app/config/config_test.yml | 7 - .../App/app/config/parameters.gitlab-ci.yml | 7 - .../Fixtures/App/app/config/parameters.yml | 13 - .../App/app/config/parameters.yml.dist | 7 - .../test/Fixtures/App/app/config/routing.yml | 3 - .../Resources/test/Fixtures/App/app/console | 27 - .../test/Fixtures/App/web/.gitignore | 2 - 179 files changed, 29705 deletions(-) delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/AppKernel.php delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/Resources/views/CustomField/simple_form_render.html.twig delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/autoload.php delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/config/config.yml delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/config/config_dev.yml delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/config/config_test.yml delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/config/config_test_customizable_entities_test_not_empty_config.yml delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/config/routing.yml delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/console delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/logs/empty delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/web/app_dev.php delete mode 100644 src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/AppKernel.php delete mode 100644 src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/config.yml delete mode 100644 src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/config_test.yml delete mode 100644 src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.gitlab-ci.yml delete mode 100644 src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.yml delete mode 100644 src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.yml.dist delete mode 100644 src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/routing.yml delete mode 100644 src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/console delete mode 100644 src/Bundle/ChillEventBundle/Resources/test/bootstrap.php delete mode 100644 src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php delete mode 100644 src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore delete mode 100644 src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php delete mode 100644 src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/config/config.yml delete mode 100644 src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/config/config_test.yml delete mode 100644 src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml delete mode 100644 src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist delete mode 100644 src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/config/routing.yml delete mode 100644 src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/console delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/autoload.php delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/config.yml delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/config_dev.yml delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/config_test.yml delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/config_test_with_hidden_fields.yml delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/config/routing.yml delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/console delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/logs/empty delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/app_dev.php delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/CONTRIBUTING.md delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/LICENSE delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/README.md delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/bower.json delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/component.json delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/composer.json delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/admin.css delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/chillmain.css delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/gumby.css delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/pikaday.css delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/FontAwesome.otf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Light.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-LightItalic.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/MerriweatherSans-Regular.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Merriweather_Sans/OFL.txt delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/OFL.txt delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Bold.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Light.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen/Oxygen-Regular.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen_Mono/OFL.txt delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/Oxygen_Mono/OxygenMono-Regular.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.eot delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.svg delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/fontawesome-webfont.woff delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Bold.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Italic.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Light.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-LightItalic.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/MerriweatherSans-Regular.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Merriweather_Sans/OFL.txt delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/OFL.txt delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Bold.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Light.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen/Oxygen-Regular.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen_Mono/OFL.txt delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/Oxygen_Mono/OxygenMono-Regular.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.eot delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.ttf delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/fonts/icons/entypo.woff delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/js/jquery.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/js/modernizr-2.6.2.min.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/moment.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/package.json delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/pikaday.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/plugins/pikaday.jquery.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/release.sh delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2-bootstrap.css delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2-spinner.gif delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2.css delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2.jquery.json delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2.min.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2.png delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ar.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_az.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_bg.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ca.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_cs.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_da.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_de.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_el.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_en.js.template delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_es.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_et.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_eu.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_fa.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_fi.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_fr.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_gl.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_he.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_hr.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_hu.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_id.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_is.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_it.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ja.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ka.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ko.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_lt.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_lv.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_mk.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ms.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_nb.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_nl.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_pl.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_pt-BR.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_pt-PT.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ro.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_rs.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ru.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_sk.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_sv.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_th.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_tr.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_ug-CN.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_uk.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_vi.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_zh-CN.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2_locale_zh-TW.js delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/select2x2.png delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/stylesheets/sass/_custom.scss delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/stylesheets/scratch.css delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/stylesheets/scratch.css.map delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/framework/css/body.css delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/framework/css/exception.css delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/framework/css/structure.css delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/framework/images/blue_picto_less.gif delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/framework/images/blue_picto_more.gif delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/framework/images/grey_magnifier.png delete mode 100644 src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/framework/images/logo_symfony.png delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/AppKernel.php delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/autoload.php delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/bootstrap.php.cache delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/config/config.yml delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/config/config_dev.yml delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/config/config_test.yml delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/config/parameters.yml delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/config/routing.yml delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/console delete mode 100644 src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/web/.gitignore diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/AppKernel.php b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/AppKernel.php deleted file mode 100644 index 901806f8c..000000000 --- a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/AppKernel.php +++ /dev/null @@ -1,55 +0,0 @@ -getRootDir() . '/../logs'; - } - - public function registerBundles() - { - return [ - new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), - new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(), - new Symfony\Bundle\SecurityBundle\SecurityBundle(), - new Symfony\Bundle\MonologBundle\MonologBundle(), - new Symfony\Bundle\TwigBundle\TwigBundle(), - new \Symfony\Bundle\AsseticBundle\AsseticBundle(), - new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), - new \Chill\MainBundle\ChillMainBundle(), - new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(), - new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), - new Chill\PersonBundle\ChillPersonBundle(), - //add here all the required bundle (some bundle are not required) - ]; - } - - public function registerContainerConfiguration(LoaderInterface $loader) - { - $loader->load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml'); - } -} diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore deleted file mode 100644 index d6b7ef32c..000000000 --- a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/Resources/views/CustomField/simple_form_render.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/Resources/views/CustomField/simple_form_render.html.twig deleted file mode 100644 index 0fe833294..000000000 --- a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/Resources/views/CustomField/simple_form_render.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% if inputKeys is defined %} -{% for key in inputKeys %} -{{ form_row(form[key]) }} -{% endfor %} -{% else %} -{{ form(form) }} -{% endif %} diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig deleted file mode 100644 index a40ea56af..000000000 --- a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig +++ /dev/null @@ -1,14 +0,0 @@ - - - - - {% block title %}Welcome!{% endblock %} - {% block stylesheets %}{% endblock %} - - {% block javascripts_head %}{% endblock %} - - - {% block body %}{% endblock %} - {% block javascripts %}{% endblock %} - - diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/autoload.php b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/autoload.php deleted file mode 100644 index ea351fb8a..000000000 --- a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/autoload.php +++ /dev/null @@ -1,20 +0,0 @@ -getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); -$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; - -if ($debug) { - Debug::enable(); -} - -$kernel = new AppKernel($env, $debug); -$application = new Application($kernel); -$application->run($input); diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/logs/empty b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/logs/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/web/app_dev.php b/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/web/app_dev.php deleted file mode 100644 index e171c8521..000000000 --- a/src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/web/app_dev.php +++ /dev/null @@ -1,41 +0,0 @@ -loadClassCache(); -$request = Request::createFromGlobals(); -$response = $kernel->handle($request); -$response->send(); -$kernel->terminate($request, $response); diff --git a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/AppKernel.php b/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/AppKernel.php deleted file mode 100644 index 5d91c6f5c..000000000 --- a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/AppKernel.php +++ /dev/null @@ -1,55 +0,0 @@ -load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml'); - } -} diff --git a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/config.yml b/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/config.yml deleted file mode 100644 index cf6bb3108..000000000 --- a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/config.yml +++ /dev/null @@ -1,43 +0,0 @@ -imports: - - { resource: parameters.yml } - -framework: - secret: Not very secret - router: { resource: "%kernel.root_dir%/config/routing.yml" } - form: true - csrf_protection: true - session: ~ - default_locale: fr - translator: { fallback: fr } - profiler: { only_exceptions: false } - templating: - engines: ['twig'] - -# Doctrine Configuration -doctrine: - dbal: - driver: pdo_pgsql - host: "%database_host%" - port: "%database_port%" - dbname: "%database_name%" - user: "%database_user%" - password: "%database_password%" - charset: UTF8 - mapping_types: - jsonb: json_array - - orm: - auto_generate_proxy_classes: "%kernel.debug%" - auto_mapping: true - -# Assetic Configuration -assetic: - debug: "%kernel.debug%" - use_controller: false - bundles: [ ] - #java: /usr/bin/java - filters: - cssrewrite: ~ - -chill_main: - available_languages: [fr, en] diff --git a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/config_test.yml b/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/config_test.yml deleted file mode 100644 index b4f6d786a..000000000 --- a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/config_test.yml +++ /dev/null @@ -1,52 +0,0 @@ -imports: - - { resource: config.yml } - -framework: - test: ~ - session: - storage_id: session.storage.filesystem - -security: - role_hierarchy: - CHILL_MASTER_ROLE: [CHILL_INHERITED_ROLE_1] - providers: - chain_provider: - chain : - providers: [in_memory, users] - in_memory: - memory: - users: - admin: { password: "password", roles: 'ROLE_ADMIN' } - users: - entity: - class: Chill\MainBundle\Entity\User - property: username - - encoders: - Chill\MainBundle\Entity\User: - algorithm: bcrypt - Symfony\Component\Security\Core\User\User: - algorithm: plaintext - - firewalls: - dev: - pattern: ^/(_(profiler|wdt)|css|images|js)/ - security: false - - - - default: - anonymous: ~ - http_basic: ~ - form_login: - csrf_parameter: _csrf_token - csrf_token_id: authenticate - csrf_provider: form.csrf_provider - - logout: ~ - - - access_control: - - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/[a-z]*/admin, roles: ROLE_ADMIN } - - { path: ^/, roles: ROLE_USER } \ No newline at end of file diff --git a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.gitlab-ci.yml b/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.gitlab-ci.yml deleted file mode 100644 index c4e63ef76..000000000 --- a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.gitlab-ci.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - database_host: chill__database - database_port: 5432 - database_name: postgres - database_user: postgres - database_password: postgres - locale: fr - secret: ThisTokenIsNotSoSecretChangeIt - debug_toolbar: true - debug_redirects: false - use_assetic_controller: true \ No newline at end of file diff --git a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.yml b/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.yml deleted file mode 100644 index d92cc2318..000000000 --- a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - database_host: 127.0.0.1 - database_port: 5435 - database_name: postgres - database_user: postgres - database_password: postgres - locale: fr - secret: ThisTokenIsNotSoSecretChangeIt - debug_toolbar: true - debug_redirects: false - use_assetic_controller: true \ No newline at end of file diff --git a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.yml.dist b/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.yml.dist deleted file mode 100644 index 38fab7fd2..000000000 --- a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/parameters.yml.dist +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - database_host: 127.0.0.1 - database_port: 5435 - database_name: chill - database_user: chill - database_password: chill - locale: fr - secret: ThisTokenIsNotSoSecretChangeIt - debug_toolbar: true - debug_redirects: false - use_assetic_controller: true \ No newline at end of file diff --git a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/routing.yml b/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/routing.yml deleted file mode 100644 index 802d3a1c8..000000000 --- a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/config/routing.yml +++ /dev/null @@ -1,4 +0,0 @@ -#load routes for chil bundles -chill_routes: - resource: . - type: chill_routes \ No newline at end of file diff --git a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/console b/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/console deleted file mode 100644 index 4ee9cfb33..000000000 --- a/src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/console +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env php -getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'test'); -$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; - -if ($debug) { - Debug::enable(); -} - -$kernel = new AppKernel($env, $debug); -$application = new Application($kernel); -$application->run($input); diff --git a/src/Bundle/ChillEventBundle/Resources/test/bootstrap.php b/src/Bundle/ChillEventBundle/Resources/test/bootstrap.php deleted file mode 100644 index 9d402a12b..000000000 --- a/src/Bundle/ChillEventBundle/Resources/test/bootstrap.php +++ /dev/null @@ -1,16 +0,0 @@ -load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml'); - } -} diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore deleted file mode 100644 index c96a04f00..000000000 --- a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php b/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php deleted file mode 100644 index ea351fb8a..000000000 --- a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php +++ /dev/null @@ -1,20 +0,0 @@ -getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); -$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; - -if ($debug) { - Debug::enable(); -} - -$kernel = new AppKernel($env, $debug); -$application = new Application($kernel); -$application->run($input); diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php deleted file mode 100644 index d39adffaf..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php +++ /dev/null @@ -1,55 +0,0 @@ -load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml'); - } -} diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore deleted file mode 100644 index d6b7ef32c..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig deleted file mode 100644 index bafd28d3b..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {% block title %}Welcome!{% endblock %} - {% block stylesheets %}{% endblock %} - - - - {% block body %}{% endblock %} - {% block javascripts %}{% endblock %} - - diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/autoload.php b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/autoload.php deleted file mode 100644 index ea351fb8a..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/autoload.php +++ /dev/null @@ -1,20 +0,0 @@ -getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); -$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; - -if ($debug) { - Debug::enable(); -} - -$kernel = new AppKernel($env, $debug); -$application = new Application($kernel); -$application->run($input); diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/logs/empty b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/logs/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/app_dev.php b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/app_dev.php deleted file mode 100644 index e171c8521..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/app_dev.php +++ /dev/null @@ -1,41 +0,0 @@ -loadClassCache(); -$request = Request::createFromGlobals(); -$response = $kernel->handle($request); -$response->send(); -$kernel->terminate($request, $response); diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/CONTRIBUTING.md b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/CONTRIBUTING.md deleted file mode 100644 index bca4baf61..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/CONTRIBUTING.md +++ /dev/null @@ -1,107 +0,0 @@ -Contributing to Select2 -======================= -Looking to contribute something to Select2? **Here's how you can help.** - -Please take a moment to review this document in order to make the contribution -process easy and effective for everyone involved. - -Following these guidelines helps to communicate that you respect the time of -the developers managing and developing this open source project. In return, -they should reciprocate that respect in addressing your issue or assessing -patches and features. - -Using the issue tracker ------------------------ -When [reporting bugs][reporting-bugs] or -[requesting features][requesting-features], the -[issue tracker on GitHub][issue-tracker] is the recommended channel to use. - -The issue tracker **is not** a place for support requests. The -[mailing list][mailing-list] or [IRC channel][irc-channel] are better places to -get help. - -Reporting bugs with Select2 ---------------------------- -We really appreciate clear bug reports that _consistently_ show an issue -_within Select2_. - -The ideal bug report follows these guidelines: - -1. **Use the [GitHub issue search][issue-search]** — Check if the issue - has already been reported. -2. **Check if the issue has been fixed** — Try to reproduce the problem - using the code in the `master` branch. -3. **Isolate the problem** — Try to create an - [isolated test case][isolated-case] that consistently reproduces the problem. - -Please try to be as detailed as possible in your bug report, especially if an -isolated test case cannot be made. Some useful questions to include the answer -to are: - -- What steps can be used to reproduce the issue? -- What is the bug and what is the expected outcome? -- What browser(s) and Operating System have you tested with? -- Does the bug happen consistently across all tested browsers? -- What version of jQuery are you using? And what version of Select2? -- Are you using Select2 with other plugins? - -All of these questions will help people fix and identify any potential bugs. - -Requesting features in Select2 ------------------------------- -Select2 is a large library that carries with it a lot of functionality. Because -of this, many feature requests will not be implemented in the core library. - -Before starting work on a major feature for Select2, **contact the -[community][community] first** or you may risk spending a considerable amount of -time on something which the project developers are not interested in bringing -into the project. - -### Select2 4.0 - -Many feature requests will be closed off until 4.0, where Select2 plans to adopt -a more flexible API. If you are interested in helping with the development of -the next major Select2 release, please send a message to the -[mailing list][mailing-list] or [irc channel][irc-channel] for more information. - -Triaging issues and pull requests ---------------------------------- -Anyone can help the project maintainers triage issues and review pull requests. - -### Handling new issues - -Select2 regularly receives new issues which need to be tested and organized. - -When a new issue that comes in that is similar to another existing issue, it -should be checked to make sure it is not a duplicate. Duplicates issues should -be marked by replying to the issue with "Duplicate of #[issue number]" where -`[issue number]` is the url or issue number for the existing issue. This will -allow the project maintainers to quickly close off additional issues and keep -the discussion focused within a single issue. - -If you can test issues that are reported to Select2 that contain test cases and -confirm under what conditions bugs happen, that will allow others to identify -what causes a bug quicker. - -### Reviewing pull requests - -It is very common for pull requests to be opened for issues that contain a clear -solution to the problem. These pull requests should be rigorously reviewed by -the community before being accepted. If you are not sure about a piece of -submitted code, or know of a better way to do something, do not hesitate to make -a comment on the pull request. - -It should also be made clear that **all code contributed to Select** must be -licensable under the [Apache 2 or GPL 2 licenses][licensing]. Code that cannot -be released under either of these licenses **cannot be accepted** into the -project. - -[community]: https://github.com/ivaynberg/select2#community -[reporting-bugs]: #reporting-bugs-with-select2 -[requesting-features]: #requesting-features-in-select2 -[issue-tracker]: https://github.com/ivaynberg/select2/issues -[mailing-list]: https://github.com/ivaynberg/select2#mailing-list -[irc-channel]: https://github.com/ivaynberg/select2#irc-channel -[issue-search]: https://github.com/ivaynberg/select2/search?q=&type=Issues -[isolated-case]: http://css-tricks.com/6263-reduced-test-cases/ -[licensing]: https://github.com/ivaynberg/select2#copyright-and-license diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/LICENSE b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/LICENSE deleted file mode 100644 index 0247cc762..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/LICENSE +++ /dev/null @@ -1,18 +0,0 @@ -Copyright 2014 Igor Vaynberg - -Version: @@ver@@ Timestamp: @@timestamp@@ - -This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU -General Public License version 2 (the "GPL License"). You may choose either license to govern your -use of this software only upon the condition that you accept all of the terms of either the Apache -License or the GPL License. - -You may obtain a copy of the Apache License and the GPL License at: - -http://www.apache.org/licenses/LICENSE-2.0 -http://www.gnu.org/licenses/gpl-2.0.html - -Unless required by applicable law or agreed to in writing, software distributed under the Apache License -or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -either express or implied. See the Apache License and the GPL License for the specific language governing -permissions and limitations under the Apache License and the GPL License. diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/README.md b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/README.md deleted file mode 100644 index 64380c451..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/README.md +++ /dev/null @@ -1,114 +0,0 @@ -Select2 -======= - -Select2 is a jQuery-based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results. - -To get started, checkout examples and documentation at http://ivaynberg.github.com/select2 - -Use cases ---------- - -* Enhancing native selects with search. -* Enhancing native selects with a better multi-select interface. -* Loading data from JavaScript: easily load items via ajax and have them searchable. -* Nesting optgroups: native selects only support one level of nested. Select2 does not have this restriction. -* Tagging: ability to add new items on the fly. -* Working with large, remote datasets: ability to partially load a dataset based on the search term. -* Paging of large datasets: easy support for loading more pages when the results are scrolled to the end. -* Templating: support for custom rendering of results and selections. - -Browser compatibility ---------------------- -* IE 8+ -* Chrome 8+ -* Firefox 10+ -* Safari 3+ -* Opera 10.6+ - -Usage ------ -You can source Select2 directly from a CDN like [JSDliver](http://www.jsdelivr.com/#!select2) or [CDNJS](http://www.cdnjs.com/libraries/select2), [download it from this GitHub repo](https://github.com/ivaynberg/select2/tags), or use one of the integrations below. - -Integrations ------------- - -* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / [Apache Wicket](http://wicket.apache.org)) -* [select2-rails](https://github.com/argerim/select2-rails) (Ruby on Rails) -* [AngularUI](http://angular-ui.github.io/#ui-select) ([AngularJS](https://angularjs.org/)) -* [Django](https://github.com/applegrew/django-select2) -* [Symfony](https://github.com/19Gerhard85/sfSelect2WidgetsPlugin) -* [Symfony2](https://github.com/avocode/FormExtensions) -* [Bootstrap 2](https://github.com/t0m/select2-bootstrap-css) and [Bootstrap 3](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3) (CSS skins) -* [Meteor](https://github.com/nate-strauser/meteor-select2) (modern reactive JavaScript framework; + [Bootstrap 3 skin](https://github.com/esperadomedia/meteor-select2-bootstrap3-css/)) -* [Meteor](https://jquery-select2.meteor.com) -* [Yii 2.x](http://demos.krajee.com/widgets#select2) -* [Yii 1.x](https://github.com/tonybolzan/yii-select2) -* [AtmosphereJS](https://atmospherejs.com/package/jquery-select2) - -### Example Integrations - -* [Knockout.js](https://github.com/ivaynberg/select2/wiki/Knockout.js-Integration) -* [Socket.IO](https://github.com/ivaynberg/select2/wiki/Socket.IO-Integration) -* [PHP](https://github.com/ivaynberg/select2/wiki/PHP-Example) -* [.Net MVC] (https://github.com/ivaynberg/select2/wiki/.Net-MVC-Example) - -Internationalization (i18n) ---------------------------- - -Select2 supports multiple languages by simply including the right language JS -file (`select2_locale_it.js`, `select2_locale_nl.js`, etc.) after `select2.js`. - -Missing a language? Just copy `select2_locale_en.js.template`, translate -it, and make a pull request back to Select2 here on GitHub. - -Documentation -------------- - -The documentation for Select2 is available [through GitHub Pages](https://ivaynberg.github.io/select2/) and is located within this repository in the [`gh-pages` branch](https://github.com/ivaynberg/select2/tree/gh-pages). - -Community ---------- - -### Bug tracker - -Have a bug? Please create an issue here on GitHub! - -https://github.com/ivaynberg/select2/issues - -### Mailing list - -Have a question? Ask on our mailing list! - -select2@googlegroups.com - -https://groups.google.com/d/forum/select2 - -### IRC channel - -Need help implementing Select2 in your project? Ask in our IRC channel! - -**Network:** [Freenode](https://freenode.net/) (`chat.freenode.net`) - -**Channel:** `#select2` - -**Web access:** https://webchat.freenode.net/?channels=select2 - -Copyright and license ---------------------- - -Copyright 2012 Igor Vaynberg - -This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU -General Public License version 2 (the "GPL License"). You may choose either license to govern your -use of this software only upon the condition that you accept all of the terms of either the Apache -License or the GPL License. - -You may obtain a copy of the Apache License and the GPL License in the LICENSE file, or at: - -http://www.apache.org/licenses/LICENSE-2.0 -http://www.gnu.org/licenses/gpl-2.0.html - -Unless required by applicable law or agreed to in writing, software distributed under the Apache License -or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -either express or implied. See the Apache License and the GPL License for the specific language governing -permissions and limitations under the Apache License and the GPL License. diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/bower.json b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/bower.json deleted file mode 100644 index 54d44c459..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/bower.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "select2", - "version": "3.5.2", - "main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "select2-spinner.gif"], - "dependencies": { - "jquery": ">= 1.7.1" - } -} diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/component.json b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/component.json deleted file mode 100644 index 8bd3c020a..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/component.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name": "select2", - "repo": "ivaynberg/select2", - "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.", - "version": "3.5.2", - "demo": "http://ivaynberg.github.io/select2/", - "keywords": [ - "jquery" - ], - "main": "select2.js", - "styles": [ - "select2.css", - "select2-bootstrap.css" - ], - "scripts": [ - "select2.js", - "select2_locale_ar.js", - "select2_locale_bg.js", - "select2_locale_ca.js", - "select2_locale_cs.js", - "select2_locale_da.js", - "select2_locale_de.js", - "select2_locale_el.js", - "select2_locale_es.js", - "select2_locale_et.js", - "select2_locale_eu.js", - "select2_locale_fa.js", - "select2_locale_fi.js", - "select2_locale_fr.js", - "select2_locale_gl.js", - "select2_locale_he.js", - "select2_locale_hr.js", - "select2_locale_hu.js", - "select2_locale_id.js", - "select2_locale_is.js", - "select2_locale_it.js", - "select2_locale_ja.js", - "select2_locale_ka.js", - "select2_locale_ko.js", - "select2_locale_lt.js", - "select2_locale_lv.js", - "select2_locale_mk.js", - "select2_locale_ms.js", - "select2_locale_nl.js", - "select2_locale_no.js", - "select2_locale_pl.js", - "select2_locale_pt-BR.js", - "select2_locale_pt-PT.js", - "select2_locale_ro.js", - "select2_locale_ru.js", - "select2_locale_sk.js", - "select2_locale_sv.js", - "select2_locale_th.js", - "select2_locale_tr.js", - "select2_locale_uk.js", - "select2_locale_vi.js", - "select2_locale_zh-CN.js", - "select2_locale_zh-TW.js" - ], - "images": [ - "select2-spinner.gif", - "select2.png", - "select2x2.png" - ], - "license": "MIT" -} diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/composer.json b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/composer.json deleted file mode 100644 index cd2d26a2a..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/composer.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": - "ivaynberg/select2", - "description": "Select2 is a jQuery based replacement for select boxes.", - "version": "3.5.2", - "type": "component", - "homepage": "http://ivaynberg.github.io/select2/", - "license": "Apache-2.0", - "require": { - "robloach/component-installer": "*", - "components/jquery": ">=1.7.1" - }, - "extra": { - "component": { - "scripts": [ - "select2.js" - ], - "files": [ - "select2.js", - "select2_locale_*.js", - "select2.css", - "select2-bootstrap.css", - "select2-spinner.gif", - "select2.png", - "select2x2.png" - ] - } - } -} diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/admin.css b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/admin.css deleted file mode 100644 index e4ef36d42..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/admin.css +++ /dev/null @@ -1,2 +0,0 @@ -ul.admin_tiles li { background: none repeat scroll 0 0 #E9E9E9; border: 1px solid #C9C9C9; padding: 1.5em; margin-left: 1.5em; margin-bottom: 1.5em; } -ul.admin_tiles li p, ul.admin_tiles li h1, ul.admin_tiles li h2, ul.admin_tiles li h3 { width: 350px; } diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/chillmain.css b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/chillmain.css deleted file mode 100644 index 85c247173..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/chillmain.css +++ /dev/null @@ -1,25 +0,0 @@ -div#usefulbar { background-color: #fbba3a; z-index: 1000; padding-right: 15px; } -div#usefulbar form { margin: 0; } -div#usefulbar i.menu { font-size: 2em; } -div#usefulbar ul { display: flex; justify-content: flex-end; margin: 0; padding-top: 5px; padding-right: 10px; } -div#usefulbar li { color: white; margin-left: 10px; } -div#usefulbar li a { color: white; text-shadow: 0px 0px 1px #555; } -div#usefulbar li i.icon-user-add:before { vertical-align: -5px; } -div#usefulbar li#search_element { text-align: right; } -div#usefulbar li#search_element div#search_form { margin: 0; padding: 0; } -div#usefulbar li#search_element div#search_form div { margin: 0; } -div#usefulbar li#search_element div#search_form .field { margin: 0; } -div#usefulbar li#search_element div#search_form button { color: white; border: none; bottom: -2px; height: 35px; } - -div#flashMessages { margin-top: 20px; } -div#flashMessages .flash-notice { margin-top: 10px; margin-bottom: 10px; } - -.personName { font-variant: small-caps; text-transform: capitalize; } - -.personName { text-transform: capitalize; } - -input.belgian_national_number_inversed_date { width: 7em; margin-right: 1em; } - -input.belgian_national_number_daily_counter { width: 4em; margin-right: 1em; } - -input.belgian_national_number_control_digit { width: 3em; } \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/gumby.css b/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/gumby.css deleted file mode 100644 index 24a87ec7a..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/bundles/chillmain/css/gumby.css +++ /dev/null @@ -1,2617 +0,0 @@ -@charset "UTF-8"; -/** -* Gumby Framework -* --------------- -* -* Follow @gumbycss on twitter and spread the love. -* We worked super hard on making this awesome and released it to the web. -* All we ask is you leave this intact. #gumbyisawesome -* -* Gumby Framework -* http://gumbyframework.com -* -* Built with love by your friends @digitalsurgeons -* http://www.digitalsurgeons.com -* -* Free to use under the MIT license. -* http://www.opensource.org/licenses/mit-license.php -*/ -html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font: inherit; font-size: 100%; vertical-align: baseline; } - -html { line-height: 1; } - -ol, ul { list-style: none; } - -table { border-collapse: collapse; border-spacing: 0; } - -caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } - -q, blockquote { quotes: none; } -q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } - -a img { border: none; } - -article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; } - -.pull_right { float: right; } - -.pull_left { float: left; } - -* html { font-size: 100%; } - -html { font-size: 16px; line-height: 1.625em; } - -* { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } - -body { background: white; font-family: "Oxygen"; font-weight: 400; color: #555555; position: relative; -webkit-font-smoothing: antialiased; } -@media only screen and (max-width: 767px) { body { -webkit-text-size-adjust: none; -ms-text-size-adjust: none; width: 100%; min-width: 0; } } - -html, body { height: 100%; } - -.hide { display: none; } - -.hide.active, .show { display: block; } - -.icon-note.icon-left a:before, .icon-note.icon-right a:after { content: "\266a"; height: inherit; } - -i.icon-note:before { content: "\266a"; height: inherit; } - -.icon-note-beamed.icon-left a:before, .icon-note-beamed.icon-right a:after { content: "\266b"; height: inherit; } - -i.icon-note-beamed:before { content: "\266b"; height: inherit; } - -.icon-music.icon-left a:before, .icon-music.icon-right a:after { content: "🎵"; height: inherit; } - -i.icon-music:before { content: "🎵"; height: inherit; } - -.icon-search.icon-left a:before, .icon-search.icon-right a:after { content: "🔍"; height: inherit; } - -i.icon-search:before { content: "🔍"; height: inherit; } - -.icon-flashlight.icon-left a:before, .icon-flashlight.icon-right a:after { content: "🔦"; height: inherit; } - -i.icon-flashlight:before { content: "🔦"; height: inherit; } - -.icon-mail.icon-left a:before, .icon-mail.icon-right a:after { content: "\2709"; height: inherit; } - -i.icon-mail:before { content: "\2709"; height: inherit; } - -.icon-heart.icon-left a:before, .icon-heart.icon-right a:after { content: "\2665"; height: inherit; } - -i.icon-heart:before { content: "\2665"; height: inherit; } - -.icon-heart-empty.icon-left a:before, .icon-heart-empty.icon-right a:after { content: "\2661"; height: inherit; } - -i.icon-heart-empty:before { content: "\2661"; height: inherit; } - -.icon-star.icon-left a:before, .icon-star.icon-right a:after { content: "\2605"; height: inherit; } - -i.icon-star:before { content: "\2605"; height: inherit; } - -.icon-star-empty.icon-left a:before, .icon-star-empty.icon-right a:after { content: "\2606"; height: inherit; } - -i.icon-star-empty:before { content: "\2606"; height: inherit; } - -.icon-user.icon-left a:before, .icon-user.icon-right a:after { content: "👤"; height: inherit; } - -i.icon-user:before { content: "👤"; height: inherit; } - -.icon-users.icon-left a:before, .icon-users.icon-right a:after { content: "👥"; height: inherit; } - -i.icon-users:before { content: "👥"; height: inherit; } - -.icon-user-add.icon-left a:before, .icon-user-add.icon-right a:after { content: "\e700"; height: inherit; } - -i.icon-user-add:before { content: "\e700"; height: inherit; } - -.icon-video.icon-left a:before, .icon-video.icon-right a:after { content: "🎬"; height: inherit; } - -i.icon-video:before { content: "🎬"; height: inherit; } - -.icon-picture.icon-left a:before, .icon-picture.icon-right a:after { content: "🌄"; height: inherit; } - -i.icon-picture:before { content: "🌄"; height: inherit; } - -.icon-camera.icon-left a:before, .icon-camera.icon-right a:after { content: "📷"; height: inherit; } - -i.icon-camera:before { content: "📷"; height: inherit; } - -.icon-layout.icon-left a:before, .icon-layout.icon-right a:after { content: "\268f"; height: inherit; } - -i.icon-layout:before { content: "\268f"; height: inherit; } - -.icon-menu.icon-left a:before, .icon-menu.icon-right a:after { content: "\2630"; height: inherit; } - -i.icon-menu:before { content: "\2630"; height: inherit; } - -.icon-check.icon-left a:before, .icon-check.icon-right a:after { content: "\2713"; height: inherit; } - -i.icon-check:before { content: "\2713"; height: inherit; } - -.icon-cancel.icon-left a:before, .icon-cancel.icon-right a:after { content: "\2715"; height: inherit; } - -i.icon-cancel:before { content: "\2715"; height: inherit; } - -.icon-cancel-circled.icon-left a:before, .icon-cancel-circled.icon-right a:after { content: "\2716"; height: inherit; } - -i.icon-cancel-circled:before { content: "\2716"; height: inherit; } - -.icon-cancel-squared.icon-left a:before, .icon-cancel-squared.icon-right a:after { content: "\274e"; height: inherit; } - -i.icon-cancel-squared:before { content: "\274e"; height: inherit; } - -.icon-plus.icon-left a:before, .icon-plus.icon-right a:after { content: "\2b"; height: inherit; } - -i.icon-plus:before { content: "\2b"; height: inherit; } - -.icon-plus-circled.icon-left a:before, .icon-plus-circled.icon-right a:after { content: "\2795"; height: inherit; } - -i.icon-plus-circled:before { content: "\2795"; height: inherit; } - -.icon-plus-squared.icon-left a:before, .icon-plus-squared.icon-right a:after { content: "\229e"; height: inherit; } - -i.icon-plus-squared:before { content: "\229e"; height: inherit; } - -.icon-minus.icon-left a:before, .icon-minus.icon-right a:after { content: "\2d"; height: inherit; } - -i.icon-minus:before { content: "\2d"; height: inherit; } - -.icon-minus-circled.icon-left a:before, .icon-minus-circled.icon-right a:after { content: "\2796"; height: inherit; } - -i.icon-minus-circled:before { content: "\2796"; height: inherit; } - -.icon-minus-squared.icon-left a:before, .icon-minus-squared.icon-right a:after { content: "\229f"; height: inherit; } - -i.icon-minus-squared:before { content: "\229f"; height: inherit; } - -.icon-help.icon-left a:before, .icon-help.icon-right a:after { content: "\2753"; height: inherit; } - -i.icon-help:before { content: "\2753"; height: inherit; } - -.icon-help-circled.icon-left a:before, .icon-help-circled.icon-right a:after { content: "\e704"; height: inherit; } - -i.icon-help-circled:before { content: "\e704"; height: inherit; } - -.icon-info.icon-left a:before, .icon-info.icon-right a:after { content: "\2139"; height: inherit; } - -i.icon-info:before { content: "\2139"; height: inherit; } - -.icon-info-circled.icon-left a:before, .icon-info-circled.icon-right a:after { content: "\e705"; height: inherit; } - -i.icon-info-circled:before { content: "\e705"; height: inherit; } - -.icon-back.icon-left a:before, .icon-back.icon-right a:after { content: "🔙"; height: inherit; } - -i.icon-back:before { content: "🔙"; height: inherit; } - -.icon-home.icon-left a:before, .icon-home.icon-right a:after { content: "\2302"; height: inherit; } - -i.icon-home:before { content: "\2302"; height: inherit; } - -.icon-link.icon-left a:before, .icon-link.icon-right a:after { content: "🔗"; height: inherit; } - -i.icon-link:before { content: "🔗"; height: inherit; } - -.icon-attach.icon-left a:before, .icon-attach.icon-right a:after { content: "📎"; height: inherit; } - -i.icon-attach:before { content: "📎"; height: inherit; } - -.icon-lock.icon-left a:before, .icon-lock.icon-right a:after { content: "🔒"; height: inherit; } - -i.icon-lock:before { content: "🔒"; height: inherit; } - -.icon-lock-open.icon-left a:before, .icon-lock-open.icon-right a:after { content: "🔓"; height: inherit; } - -i.icon-lock-open:before { content: "🔓"; height: inherit; } - -.icon-eye.icon-left a:before, .icon-eye.icon-right a:after { content: "\e70a"; height: inherit; } - -i.icon-eye:before { content: "\e70a"; height: inherit; } - -.icon-tag.icon-left a:before, .icon-tag.icon-right a:after { content: "\e70c"; height: inherit; } - -i.icon-tag:before { content: "\e70c"; height: inherit; } - -.icon-bookmark.icon-left a:before, .icon-bookmark.icon-right a:after { content: "🔖"; height: inherit; } - -i.icon-bookmark:before { content: "🔖"; height: inherit; } - -.icon-bookmarks.icon-left a:before, .icon-bookmarks.icon-right a:after { content: "📑"; height: inherit; } - -i.icon-bookmarks:before { content: "📑"; height: inherit; } - -.icon-flag.icon-left a:before, .icon-flag.icon-right a:after { content: "\2691"; height: inherit; } - -i.icon-flag:before { content: "\2691"; height: inherit; } - -.icon-thumbs-up.icon-left a:before, .icon-thumbs-up.icon-right a:after { content: "👍"; height: inherit; } - -i.icon-thumbs-up:before { content: "👍"; height: inherit; } - -.icon-thumbs-down.icon-left a:before, .icon-thumbs-down.icon-right a:after { content: "👎"; height: inherit; } - -i.icon-thumbs-down:before { content: "👎"; height: inherit; } - -.icon-download.icon-left a:before, .icon-download.icon-right a:after { content: "📥"; height: inherit; } - -i.icon-download:before { content: "📥"; height: inherit; } - -.icon-upload.icon-left a:before, .icon-upload.icon-right a:after { content: "📤"; height: inherit; } - -i.icon-upload:before { content: "📤"; height: inherit; } - -.icon-upload-cloud.icon-left a:before, .icon-upload-cloud.icon-right a:after { content: "\e711"; height: inherit; } - -i.icon-upload-cloud:before { content: "\e711"; height: inherit; } - -.icon-reply.icon-left a:before, .icon-reply.icon-right a:after { content: "\e712"; height: inherit; } - -i.icon-reply:before { content: "\e712"; height: inherit; } - -.icon-reply-all.icon-left a:before, .icon-reply-all.icon-right a:after { content: "\e713"; height: inherit; } - -i.icon-reply-all:before { content: "\e713"; height: inherit; } - -.icon-forward.icon-left a:before, .icon-forward.icon-right a:after { content: "\27a6"; height: inherit; } - -i.icon-forward:before { content: "\27a6"; height: inherit; } - -.icon-quote.icon-left a:before, .icon-quote.icon-right a:after { content: "\275e"; height: inherit; } - -i.icon-quote:before { content: "\275e"; height: inherit; } - -.icon-code.icon-left a:before, .icon-code.icon-right a:after { content: "\e714"; height: inherit; } - -i.icon-code:before { content: "\e714"; height: inherit; } - -.icon-export.icon-left a:before, .icon-export.icon-right a:after { content: "\e715"; height: inherit; } - -i.icon-export:before { content: "\e715"; height: inherit; } - -.icon-pencil.icon-left a:before, .icon-pencil.icon-right a:after { content: "\270e"; height: inherit; } - -i.icon-pencil:before { content: "\270e"; height: inherit; } - -.icon-feather.icon-left a:before, .icon-feather.icon-right a:after { content: "\2712"; height: inherit; } - -i.icon-feather:before { content: "\2712"; height: inherit; } - -.icon-print.icon-left a:before, .icon-print.icon-right a:after { content: "\e716"; height: inherit; } - -i.icon-print:before { content: "\e716"; height: inherit; } - -.icon-retweet.icon-left a:before, .icon-retweet.icon-right a:after { content: "\e717"; height: inherit; } - -i.icon-retweet:before { content: "\e717"; height: inherit; } - -.icon-keyboard.icon-left a:before, .icon-keyboard.icon-right a:after { content: "\2328"; height: inherit; } - -i.icon-keyboard:before { content: "\2328"; height: inherit; } - -.icon-comment.icon-left a:before, .icon-comment.icon-right a:after { content: "\e718"; height: inherit; } - -i.icon-comment:before { content: "\e718"; height: inherit; } - -.icon-chat.icon-left a:before, .icon-chat.icon-right a:after { content: "\e720"; height: inherit; } - -i.icon-chat:before { content: "\e720"; height: inherit; } - -.icon-bell.icon-left a:before, .icon-bell.icon-right a:after { content: "🔔"; height: inherit; } - -i.icon-bell:before { content: "🔔"; height: inherit; } - -.icon-attention.icon-left a:before, .icon-attention.icon-right a:after { content: "\26a0"; height: inherit; } - -i.icon-attention:before { content: "\26a0"; height: inherit; } - -.icon-alert.icon-left a:before, .icon-alert.icon-right a:after { content: "💥"; height: inherit; } - -i.icon-alert:before { content: "💥"; height: inherit; } - -.icon-vcard.icon-left a:before, .icon-vcard.icon-right a:after { content: "\e722"; height: inherit; } - -i.icon-vcard:before { content: "\e722"; height: inherit; } - -.icon-address.icon-left a:before, .icon-address.icon-right a:after { content: "\e723"; height: inherit; } - -i.icon-address:before { content: "\e723"; height: inherit; } - -.icon-location.icon-left a:before, .icon-location.icon-right a:after { content: "\e724"; height: inherit; } - -i.icon-location:before { content: "\e724"; height: inherit; } - -.icon-map.icon-left a:before, .icon-map.icon-right a:after { content: "\e727"; height: inherit; } - -i.icon-map:before { content: "\e727"; height: inherit; } - -.icon-direction.icon-left a:before, .icon-direction.icon-right a:after { content: "\27a2"; height: inherit; } - -i.icon-direction:before { content: "\27a2"; height: inherit; } - -.icon-compass.icon-left a:before, .icon-compass.icon-right a:after { content: "\e728"; height: inherit; } - -i.icon-compass:before { content: "\e728"; height: inherit; } - -.icon-cup.icon-left a:before, .icon-cup.icon-right a:after { content: "\2615"; height: inherit; } - -i.icon-cup:before { content: "\2615"; height: inherit; } - -.icon-trash.icon-left a:before, .icon-trash.icon-right a:after { content: "\e729"; height: inherit; } - -i.icon-trash:before { content: "\e729"; height: inherit; } - -.icon-doc.icon-left a:before, .icon-doc.icon-right a:after { content: "\e730"; height: inherit; } - -i.icon-doc:before { content: "\e730"; height: inherit; } - -.icon-docs.icon-left a:before, .icon-docs.icon-right a:after { content: "\e736"; height: inherit; } - -i.icon-docs:before { content: "\e736"; height: inherit; } - -.icon-doc-landscape.icon-left a:before, .icon-doc-landscape.icon-right a:after { content: "\e737"; height: inherit; } - -i.icon-doc-landscape:before { content: "\e737"; height: inherit; } - -.icon-doc-text.icon-left a:before, .icon-doc-text.icon-right a:after { content: "📄"; height: inherit; } - -i.icon-doc-text:before { content: "📄"; height: inherit; } - -.icon-doc-text-inv.icon-left a:before, .icon-doc-text-inv.icon-right a:after { content: "\e731"; height: inherit; } - -i.icon-doc-text-inv:before { content: "\e731"; height: inherit; } - -.icon-newspaper.icon-left a:before, .icon-newspaper.icon-right a:after { content: "📰"; height: inherit; } - -i.icon-newspaper:before { content: "📰"; height: inherit; } - -.icon-book-open.icon-left a:before, .icon-book-open.icon-right a:after { content: "📖"; height: inherit; } - -i.icon-book-open:before { content: "📖"; height: inherit; } - -.icon-book.icon-left a:before, .icon-book.icon-right a:after { content: "📕"; height: inherit; } - -i.icon-book:before { content: "📕"; height: inherit; } - -.icon-folder.icon-left a:before, .icon-folder.icon-right a:after { content: "📁"; height: inherit; } - -i.icon-folder:before { content: "📁"; height: inherit; } - -.icon-archive.icon-left a:before, .icon-archive.icon-right a:after { content: "\e738"; height: inherit; } - -i.icon-archive:before { content: "\e738"; height: inherit; } - -.icon-box.icon-left a:before, .icon-box.icon-right a:after { content: "📦"; height: inherit; } - -i.icon-box:before { content: "📦"; height: inherit; } - -.icon-rss.icon-left a:before, .icon-rss.icon-right a:after { content: "\e73a"; height: inherit; } - -i.icon-rss:before { content: "\e73a"; height: inherit; } - -.icon-phone.icon-left a:before, .icon-phone.icon-right a:after { content: "📞"; height: inherit; } - -i.icon-phone:before { content: "📞"; height: inherit; } - -.icon-cog.icon-left a:before, .icon-cog.icon-right a:after { content: "\2699"; height: inherit; } - -i.icon-cog:before { content: "\2699"; height: inherit; } - -.icon-tools.icon-left a:before, .icon-tools.icon-right a:after { content: "\2692"; height: inherit; } - -i.icon-tools:before { content: "\2692"; height: inherit; } - -.icon-share.icon-left a:before, .icon-share.icon-right a:after { content: "\e73c"; height: inherit; } - -i.icon-share:before { content: "\e73c"; height: inherit; } - -.icon-shareable.icon-left a:before, .icon-shareable.icon-right a:after { content: "\e73e"; height: inherit; } - -i.icon-shareable:before { content: "\e73e"; height: inherit; } - -.icon-basket.icon-left a:before, .icon-basket.icon-right a:after { content: "\e73d"; height: inherit; } - -i.icon-basket:before { content: "\e73d"; height: inherit; } - -.icon-bag.icon-left a:before, .icon-bag.icon-right a:after { content: "👜"; height: inherit; } - -i.icon-bag:before { content: "👜"; height: inherit; } - -.icon-calendar.icon-left a:before, .icon-calendar.icon-right a:after { content: "📅"; height: inherit; } - -i.icon-calendar:before { content: "📅"; height: inherit; } - -.icon-login.icon-left a:before, .icon-login.icon-right a:after { content: "\e740"; height: inherit; } - -i.icon-login:before { content: "\e740"; height: inherit; } - -.icon-logout.icon-left a:before, .icon-logout.icon-right a:after { content: "\e741"; height: inherit; } - -i.icon-logout:before { content: "\e741"; height: inherit; } - -.icon-mic.icon-left a:before, .icon-mic.icon-right a:after { content: "🎤"; height: inherit; } - -i.icon-mic:before { content: "🎤"; height: inherit; } - -.icon-mute.icon-left a:before, .icon-mute.icon-right a:after { content: "🔇"; height: inherit; } - -i.icon-mute:before { content: "🔇"; height: inherit; } - -.icon-sound.icon-left a:before, .icon-sound.icon-right a:after { content: "🔊"; height: inherit; } - -i.icon-sound:before { content: "🔊"; height: inherit; } - -.icon-volume.icon-left a:before, .icon-volume.icon-right a:after { content: "\e742"; height: inherit; } - -i.icon-volume:before { content: "\e742"; height: inherit; } - -.icon-clock.icon-left a:before, .icon-clock.icon-right a:after { content: "🕔"; height: inherit; } - -i.icon-clock:before { content: "🕔"; height: inherit; } - -.icon-hourglass.icon-left a:before, .icon-hourglass.icon-right a:after { content: "\23f3"; height: inherit; } - -i.icon-hourglass:before { content: "\23f3"; height: inherit; } - -.icon-lamp.icon-left a:before, .icon-lamp.icon-right a:after { content: "💡"; height: inherit; } - -i.icon-lamp:before { content: "💡"; height: inherit; } - -.icon-light-down.icon-left a:before, .icon-light-down.icon-right a:after { content: "🔅"; height: inherit; } - -i.icon-light-down:before { content: "🔅"; height: inherit; } - -.icon-light-up.icon-left a:before, .icon-light-up.icon-right a:after { content: "🔆"; height: inherit; } - -i.icon-light-up:before { content: "🔆"; height: inherit; } - -.icon-adjust.icon-left a:before, .icon-adjust.icon-right a:after { content: "\25d1"; height: inherit; } - -i.icon-adjust:before { content: "\25d1"; height: inherit; } - -.icon-block.icon-left a:before, .icon-block.icon-right a:after { content: "🚫"; height: inherit; } - -i.icon-block:before { content: "🚫"; height: inherit; } - -.icon-resize-full.icon-left a:before, .icon-resize-full.icon-right a:after { content: "\e744"; height: inherit; } - -i.icon-resize-full:before { content: "\e744"; height: inherit; } - -.icon-resize-small.icon-left a:before, .icon-resize-small.icon-right a:after { content: "\e746"; height: inherit; } - -i.icon-resize-small:before { content: "\e746"; height: inherit; } - -.icon-popup.icon-left a:before, .icon-popup.icon-right a:after { content: "\e74c"; height: inherit; } - -i.icon-popup:before { content: "\e74c"; height: inherit; } - -.icon-publish.icon-left a:before, .icon-publish.icon-right a:after { content: "\e74d"; height: inherit; } - -i.icon-publish:before { content: "\e74d"; height: inherit; } - -.icon-window.icon-left a:before, .icon-window.icon-right a:after { content: "\e74e"; height: inherit; } - -i.icon-window:before { content: "\e74e"; height: inherit; } - -.icon-arrow-combo.icon-left a:before, .icon-arrow-combo.icon-right a:after { content: "\e74f"; height: inherit; } - -i.icon-arrow-combo:before { content: "\e74f"; height: inherit; } - -.icon-down-circled.icon-left a:before, .icon-down-circled.icon-right a:after { content: "\e758"; height: inherit; } - -i.icon-down-circled:before { content: "\e758"; height: inherit; } - -.icon-left-circled.icon-left a:before, .icon-left-circled.icon-right a:after { content: "\e759"; height: inherit; } - -i.icon-left-circled:before { content: "\e759"; height: inherit; } - -.icon-right-circled.icon-left a:before, .icon-right-circled.icon-right a:after { content: "\e75a"; height: inherit; } - -i.icon-right-circled:before { content: "\e75a"; height: inherit; } - -.icon-up-circled.icon-left a:before, .icon-up-circled.icon-right a:after { content: "\e75b"; height: inherit; } - -i.icon-up-circled:before { content: "\e75b"; height: inherit; } - -.icon-down-open.icon-left a:before, .icon-down-open.icon-right a:after { content: "\e75c"; height: inherit; } - -i.icon-down-open:before { content: "\e75c"; height: inherit; } - -.icon-left-open.icon-left a:before, .icon-left-open.icon-right a:after { content: "\e75d"; height: inherit; } - -i.icon-left-open:before { content: "\e75d"; height: inherit; } - -.icon-right-open.icon-left a:before, .icon-right-open.icon-right a:after { content: "\e75e"; height: inherit; } - -i.icon-right-open:before { content: "\e75e"; height: inherit; } - -.icon-up-open.icon-left a:before, .icon-up-open.icon-right a:after { content: "\e75f"; height: inherit; } - -i.icon-up-open:before { content: "\e75f"; height: inherit; } - -.icon-down-open-mini.icon-left a:before, .icon-down-open-mini.icon-right a:after { content: "\e760"; height: inherit; } - -i.icon-down-open-mini:before { content: "\e760"; height: inherit; } - -.icon-left-open-mini.icon-left a:before, .icon-left-open-mini.icon-right a:after { content: "\e761"; height: inherit; } - -i.icon-left-open-mini:before { content: "\e761"; height: inherit; } - -.icon-right-open-mini.icon-left a:before, .icon-right-open-mini.icon-right a:after { content: "\e762"; height: inherit; } - -i.icon-right-open-mini:before { content: "\e762"; height: inherit; } - -.icon-up-open-mini.icon-left a:before, .icon-up-open-mini.icon-right a:after { content: "\e763"; height: inherit; } - -i.icon-up-open-mini:before { content: "\e763"; height: inherit; } - -.icon-down-open-big.icon-left a:before, .icon-down-open-big.icon-right a:after { content: "\e764"; height: inherit; } - -i.icon-down-open-big:before { content: "\e764"; height: inherit; } - -.icon-left-open-big.icon-left a:before, .icon-left-open-big.icon-right a:after { content: "\e765"; height: inherit; } - -i.icon-left-open-big:before { content: "\e765"; height: inherit; } - -.icon-right-open-big.icon-left a:before, .icon-right-open-big.icon-right a:after { content: "\e766"; height: inherit; } - -i.icon-right-open-big:before { content: "\e766"; height: inherit; } - -.icon-up-open-big.icon-left a:before, .icon-up-open-big.icon-right a:after { content: "\e767"; height: inherit; } - -i.icon-up-open-big:before { content: "\e767"; height: inherit; } - -.icon-down.icon-left a:before, .icon-down.icon-right a:after { content: "\2b07"; height: inherit; } - -i.icon-down:before { content: "\2b07"; height: inherit; } - -.icon-arrow-left.icon-left a:before, .icon-arrow-left.icon-right a:after { content: "\2b05"; height: inherit; } - -i.icon-arrow-left:before { content: "\2b05"; height: inherit; } - -.icon-arrow-right.icon-left a:before, .icon-arrow-right.icon-right a:after { content: "\27a1"; height: inherit; } - -i.icon-arrow-right:before { content: "\27a1"; height: inherit; } - -.icon-up.icon-left a:before, .icon-up.icon-right a:after { content: "\2b06"; height: inherit; } - -i.icon-up:before { content: "\2b06"; height: inherit; } - -.icon-down-dir.icon-left a:before, .icon-down-dir.icon-right a:after { content: "\25be"; height: inherit; } - -i.icon-down-dir:before { content: "\25be"; height: inherit; } - -.icon-left-dir.icon-left a:before, .icon-left-dir.icon-right a:after { content: "\25c2"; height: inherit; } - -i.icon-left-dir:before { content: "\25c2"; height: inherit; } - -.icon-right-dir.icon-left a:before, .icon-right-dir.icon-right a:after { content: "\25b8"; height: inherit; } - -i.icon-right-dir:before { content: "\25b8"; height: inherit; } - -.icon-up-dir.icon-left a:before, .icon-up-dir.icon-right a:after { content: "\25b4"; height: inherit; } - -i.icon-up-dir:before { content: "\25b4"; height: inherit; } - -.icon-down-bold.icon-left a:before, .icon-down-bold.icon-right a:after { content: "\e4b0"; height: inherit; } - -i.icon-down-bold:before { content: "\e4b0"; height: inherit; } - -.icon-left-bold.icon-left a:before, .icon-left-bold.icon-right a:after { content: "\e4ad"; height: inherit; } - -i.icon-left-bold:before { content: "\e4ad"; height: inherit; } - -.icon-right-bold.icon-left a:before, .icon-right-bold.icon-right a:after { content: "\e4ae"; height: inherit; } - -i.icon-right-bold:before { content: "\e4ae"; height: inherit; } - -.icon-up-bold.icon-left a:before, .icon-up-bold.icon-right a:after { content: "\e4af"; height: inherit; } - -i.icon-up-bold:before { content: "\e4af"; height: inherit; } - -.icon-down-thin.icon-left a:before, .icon-down-thin.icon-right a:after { content: "\2193"; height: inherit; } - -i.icon-down-thin:before { content: "\2193"; height: inherit; } - -.icon-left-thin.icon-left a:before, .icon-left-thin.icon-right a:after { content: "\2190"; height: inherit; } - -i.icon-left-thin:before { content: "\2190"; height: inherit; } - -.icon-right-thin.icon-left a:before, .icon-right-thin.icon-right a:after { content: "\2192"; height: inherit; } - -i.icon-right-thin:before { content: "\2192"; height: inherit; } - -.icon-up-thin.icon-left a:before, .icon-up-thin.icon-right a:after { content: "\2191"; height: inherit; } - -i.icon-up-thin:before { content: "\2191"; height: inherit; } - -.icon-ccw.icon-left a:before, .icon-ccw.icon-right a:after { content: "\27f2"; height: inherit; } - -i.icon-ccw:before { content: "\27f2"; height: inherit; } - -.icon-cw.icon-left a:before, .icon-cw.icon-right a:after { content: "\27f3"; height: inherit; } - -i.icon-cw:before { content: "\27f3"; height: inherit; } - -.icon-arrows-ccw.icon-left a:before, .icon-arrows-ccw.icon-right a:after { content: "🔄"; height: inherit; } - -i.icon-arrows-ccw:before { content: "🔄"; height: inherit; } - -.icon-level-down.icon-left a:before, .icon-level-down.icon-right a:after { content: "\21b3"; height: inherit; } - -i.icon-level-down:before { content: "\21b3"; height: inherit; } - -.icon-level-up.icon-left a:before, .icon-level-up.icon-right a:after { content: "\21b0"; height: inherit; } - -i.icon-level-up:before { content: "\21b0"; height: inherit; } - -.icon-shuffle.icon-left a:before, .icon-shuffle.icon-right a:after { content: "🔀"; height: inherit; } - -i.icon-shuffle:before { content: "🔀"; height: inherit; } - -.icon-loop.icon-left a:before, .icon-loop.icon-right a:after { content: "🔁"; height: inherit; } - -i.icon-loop:before { content: "🔁"; height: inherit; } - -.icon-switch.icon-left a:before, .icon-switch.icon-right a:after { content: "\21c6"; height: inherit; } - -i.icon-switch:before { content: "\21c6"; height: inherit; } - -.icon-play.icon-left a:before, .icon-play.icon-right a:after { content: "\25b6"; height: inherit; } - -i.icon-play:before { content: "\25b6"; height: inherit; } - -.icon-stop.icon-left a:before, .icon-stop.icon-right a:after { content: "\25a0"; height: inherit; } - -i.icon-stop:before { content: "\25a0"; height: inherit; } - -.icon-pause.icon-left a:before, .icon-pause.icon-right a:after { content: "\2389"; height: inherit; } - -i.icon-pause:before { content: "\2389"; height: inherit; } - -.icon-record.icon-left a:before, .icon-record.icon-right a:after { content: "\26ab"; height: inherit; } - -i.icon-record:before { content: "\26ab"; height: inherit; } - -.icon-to-end.icon-left a:before, .icon-to-end.icon-right a:after { content: "\23ed"; height: inherit; } - -i.icon-to-end:before { content: "\23ed"; height: inherit; } - -.icon-to-start.icon-left a:before, .icon-to-start.icon-right a:after { content: "\23ee"; height: inherit; } - -i.icon-to-start:before { content: "\23ee"; height: inherit; } - -.icon-fast-forward.icon-left a:before, .icon-fast-forward.icon-right a:after { content: "\23e9"; height: inherit; } - -i.icon-fast-forward:before { content: "\23e9"; height: inherit; } - -.icon-fast-backward.icon-left a:before, .icon-fast-backward.icon-right a:after { content: "\23ea"; height: inherit; } - -i.icon-fast-backward:before { content: "\23ea"; height: inherit; } - -.icon-progress-0.icon-left a:before, .icon-progress-0.icon-right a:after { content: "\e768"; height: inherit; } - -i.icon-progress-0:before { content: "\e768"; height: inherit; } - -.icon-progress-1.icon-left a:before, .icon-progress-1.icon-right a:after { content: "\e769"; height: inherit; } - -i.icon-progress-1:before { content: "\e769"; height: inherit; } - -.icon-progress-2.icon-left a:before, .icon-progress-2.icon-right a:after { content: "\e76a"; height: inherit; } - -i.icon-progress-2:before { content: "\e76a"; height: inherit; } - -.icon-progress-3.icon-left a:before, .icon-progress-3.icon-right a:after { content: "\e76b"; height: inherit; } - -i.icon-progress-3:before { content: "\e76b"; height: inherit; } - -.icon-target.icon-left a:before, .icon-target.icon-right a:after { content: "🎯"; height: inherit; } - -i.icon-target:before { content: "🎯"; height: inherit; } - -.icon-palette.icon-left a:before, .icon-palette.icon-right a:after { content: "🎨"; height: inherit; } - -i.icon-palette:before { content: "🎨"; height: inherit; } - -.icon-list.icon-left a:before, .icon-list.icon-right a:after { content: "\e005"; height: inherit; } - -i.icon-list:before { content: "\e005"; height: inherit; } - -.icon-list-add.icon-left a:before, .icon-list-add.icon-right a:after { content: "\e003"; height: inherit; } - -i.icon-list-add:before { content: "\e003"; height: inherit; } - -.icon-signal.icon-left a:before, .icon-signal.icon-right a:after { content: "📶"; height: inherit; } - -i.icon-signal:before { content: "📶"; height: inherit; } - -.icon-trophy.icon-left a:before, .icon-trophy.icon-right a:after { content: "🏆"; height: inherit; } - -i.icon-trophy:before { content: "🏆"; height: inherit; } - -.icon-battery.icon-left a:before, .icon-battery.icon-right a:after { content: "🔋"; height: inherit; } - -i.icon-battery:before { content: "🔋"; height: inherit; } - -.icon-back-in-time.icon-left a:before, .icon-back-in-time.icon-right a:after { content: "\e771"; height: inherit; } - -i.icon-back-in-time:before { content: "\e771"; height: inherit; } - -.icon-monitor.icon-left a:before, .icon-monitor.icon-right a:after { content: "💻"; height: inherit; } - -i.icon-monitor:before { content: "💻"; height: inherit; } - -.icon-mobile.icon-left a:before, .icon-mobile.icon-right a:after { content: "📱"; height: inherit; } - -i.icon-mobile:before { content: "📱"; height: inherit; } - -.icon-network.icon-left a:before, .icon-network.icon-right a:after { content: "\e776"; height: inherit; } - -i.icon-network:before { content: "\e776"; height: inherit; } - -.icon-cd.icon-left a:before, .icon-cd.icon-right a:after { content: "💿"; height: inherit; } - -i.icon-cd:before { content: "💿"; height: inherit; } - -.icon-inbox.icon-left a:before, .icon-inbox.icon-right a:after { content: "\e777"; height: inherit; } - -i.icon-inbox:before { content: "\e777"; height: inherit; } - -.icon-install.icon-left a:before, .icon-install.icon-right a:after { content: "\e778"; height: inherit; } - -i.icon-install:before { content: "\e778"; height: inherit; } - -.icon-globe.icon-left a:before, .icon-globe.icon-right a:after { content: "🌎"; height: inherit; } - -i.icon-globe:before { content: "🌎"; height: inherit; } - -.icon-cloud.icon-left a:before, .icon-cloud.icon-right a:after { content: "\2601"; height: inherit; } - -i.icon-cloud:before { content: "\2601"; height: inherit; } - -.icon-cloud-thunder.icon-left a:before, .icon-cloud-thunder.icon-right a:after { content: "\26c8"; height: inherit; } - -i.icon-cloud-thunder:before { content: "\26c8"; height: inherit; } - -.icon-flash.icon-left a:before, .icon-flash.icon-right a:after { content: "\26a1"; height: inherit; } - -i.icon-flash:before { content: "\26a1"; height: inherit; } - -.icon-moon.icon-left a:before, .icon-moon.icon-right a:after { content: "\263d"; height: inherit; } - -i.icon-moon:before { content: "\263d"; height: inherit; } - -.icon-flight.icon-left a:before, .icon-flight.icon-right a:after { content: "\2708"; height: inherit; } - -i.icon-flight:before { content: "\2708"; height: inherit; } - -.icon-paper-plane.icon-left a:before, .icon-paper-plane.icon-right a:after { content: "\e79b"; height: inherit; } - -i.icon-paper-plane:before { content: "\e79b"; height: inherit; } - -.icon-leaf.icon-left a:before, .icon-leaf.icon-right a:after { content: "🍂"; height: inherit; } - -i.icon-leaf:before { content: "🍂"; height: inherit; } - -.icon-lifebuoy.icon-left a:before, .icon-lifebuoy.icon-right a:after { content: "\e788"; height: inherit; } - -i.icon-lifebuoy:before { content: "\e788"; height: inherit; } - -.icon-mouse.icon-left a:before, .icon-mouse.icon-right a:after { content: "\e789"; height: inherit; } - -i.icon-mouse:before { content: "\e789"; height: inherit; } - -.icon-briefcase.icon-left a:before, .icon-briefcase.icon-right a:after { content: "💼"; height: inherit; } - -i.icon-briefcase:before { content: "💼"; height: inherit; } - -.icon-suitcase.icon-left a:before, .icon-suitcase.icon-right a:after { content: "\e78e"; height: inherit; } - -i.icon-suitcase:before { content: "\e78e"; height: inherit; } - -.icon-dot.icon-left a:before, .icon-dot.icon-right a:after { content: "\e78b"; height: inherit; } - -i.icon-dot:before { content: "\e78b"; height: inherit; } - -.icon-dot-2.icon-left a:before, .icon-dot-2.icon-right a:after { content: "\e78c"; height: inherit; } - -i.icon-dot-2:before { content: "\e78c"; height: inherit; } - -.icon-dot-3.icon-left a:before, .icon-dot-3.icon-right a:after { content: "\e78d"; height: inherit; } - -i.icon-dot-3:before { content: "\e78d"; height: inherit; } - -.icon-brush.icon-left a:before, .icon-brush.icon-right a:after { content: "\e79a"; height: inherit; } - -i.icon-brush:before { content: "\e79a"; height: inherit; } - -.icon-magnet.icon-left a:before, .icon-magnet.icon-right a:after { content: "\e7a1"; height: inherit; } - -i.icon-magnet:before { content: "\e7a1"; height: inherit; } - -.icon-infinity.icon-left a:before, .icon-infinity.icon-right a:after { content: "\221e"; height: inherit; } - -i.icon-infinity:before { content: "\221e"; height: inherit; } - -.icon-erase.icon-left a:before, .icon-erase.icon-right a:after { content: "\232b"; height: inherit; } - -i.icon-erase:before { content: "\232b"; height: inherit; } - -.icon-chart-pie.icon-left a:before, .icon-chart-pie.icon-right a:after { content: "\e751"; height: inherit; } - -i.icon-chart-pie:before { content: "\e751"; height: inherit; } - -.icon-chart-line.icon-left a:before, .icon-chart-line.icon-right a:after { content: "📈"; height: inherit; } - -i.icon-chart-line:before { content: "📈"; height: inherit; } - -.icon-chart-bar.icon-left a:before, .icon-chart-bar.icon-right a:after { content: "📊"; height: inherit; } - -i.icon-chart-bar:before { content: "📊"; height: inherit; } - -.icon-chart-area.icon-left a:before, .icon-chart-area.icon-right a:after { content: "🔾"; height: inherit; } - -i.icon-chart-area:before { content: "🔾"; height: inherit; } - -.icon-tape.icon-left a:before, .icon-tape.icon-right a:after { content: "\2707"; height: inherit; } - -i.icon-tape:before { content: "\2707"; height: inherit; } - -.icon-graduation-cap.icon-left a:before, .icon-graduation-cap.icon-right a:after { content: "🎓"; height: inherit; } - -i.icon-graduation-cap:before { content: "🎓"; height: inherit; } - -.icon-language.icon-left a:before, .icon-language.icon-right a:after { content: "\e752"; height: inherit; } - -i.icon-language:before { content: "\e752"; height: inherit; } - -.icon-ticket.icon-left a:before, .icon-ticket.icon-right a:after { content: "🎫"; height: inherit; } - -i.icon-ticket:before { content: "🎫"; height: inherit; } - -.icon-water.icon-left a:before, .icon-water.icon-right a:after { content: "💦"; height: inherit; } - -i.icon-water:before { content: "💦"; height: inherit; } - -.icon-droplet.icon-left a:before, .icon-droplet.icon-right a:after { content: "💧"; height: inherit; } - -i.icon-droplet:before { content: "💧"; height: inherit; } - -.icon-air.icon-left a:before, .icon-air.icon-right a:after { content: "\e753"; height: inherit; } - -i.icon-air:before { content: "\e753"; height: inherit; } - -.icon-credit-card.icon-left a:before, .icon-credit-card.icon-right a:after { content: "💳"; height: inherit; } - -i.icon-credit-card:before { content: "💳"; height: inherit; } - -.icon-floppy.icon-left a:before, .icon-floppy.icon-right a:after { content: "💾"; height: inherit; } - -i.icon-floppy:before { content: "💾"; height: inherit; } - -.icon-clipboard.icon-left a:before, .icon-clipboard.icon-right a:after { content: "📋"; height: inherit; } - -i.icon-clipboard:before { content: "📋"; height: inherit; } - -.icon-megaphone.icon-left a:before, .icon-megaphone.icon-right a:after { content: "📣"; height: inherit; } - -i.icon-megaphone:before { content: "📣"; height: inherit; } - -.icon-database.icon-left a:before, .icon-database.icon-right a:after { content: "\e754"; height: inherit; } - -i.icon-database:before { content: "\e754"; height: inherit; } - -.icon-drive.icon-left a:before, .icon-drive.icon-right a:after { content: "\e755"; height: inherit; } - -i.icon-drive:before { content: "\e755"; height: inherit; } - -.icon-bucket.icon-left a:before, .icon-bucket.icon-right a:after { content: "\e756"; height: inherit; } - -i.icon-bucket:before { content: "\e756"; height: inherit; } - -.icon-thermometer.icon-left a:before, .icon-thermometer.icon-right a:after { content: "\e757"; height: inherit; } - -i.icon-thermometer:before { content: "\e757"; height: inherit; } - -.icon-key.icon-left a:before, .icon-key.icon-right a:after { content: "🔑"; height: inherit; } - -i.icon-key:before { content: "🔑"; height: inherit; } - -.icon-flow-cascade.icon-left a:before, .icon-flow-cascade.icon-right a:after { content: "\e790"; height: inherit; } - -i.icon-flow-cascade:before { content: "\e790"; height: inherit; } - -.icon-flow-branch.icon-left a:before, .icon-flow-branch.icon-right a:after { content: "\e791"; height: inherit; } - -i.icon-flow-branch:before { content: "\e791"; height: inherit; } - -.icon-flow-tree.icon-left a:before, .icon-flow-tree.icon-right a:after { content: "\e792"; height: inherit; } - -i.icon-flow-tree:before { content: "\e792"; height: inherit; } - -.icon-flow-line.icon-left a:before, .icon-flow-line.icon-right a:after { content: "\e793"; height: inherit; } - -i.icon-flow-line:before { content: "\e793"; height: inherit; } - -.icon-flow-parallel.icon-left a:before, .icon-flow-parallel.icon-right a:after { content: "\e794"; height: inherit; } - -i.icon-flow-parallel:before { content: "\e794"; height: inherit; } - -.icon-rocket.icon-left a:before, .icon-rocket.icon-right a:after { content: "🚀"; height: inherit; } - -i.icon-rocket:before { content: "🚀"; height: inherit; } - -.icon-gauge.icon-left a:before, .icon-gauge.icon-right a:after { content: "\e7a2"; height: inherit; } - -i.icon-gauge:before { content: "\e7a2"; height: inherit; } - -.icon-traffic-cone.icon-left a:before, .icon-traffic-cone.icon-right a:after { content: "\e7a3"; height: inherit; } - -i.icon-traffic-cone:before { content: "\e7a3"; height: inherit; } - -.icon-cc.icon-left a:before, .icon-cc.icon-right a:after { content: "\e7a5"; height: inherit; } - -i.icon-cc:before { content: "\e7a5"; height: inherit; } - -.icon-cc-by.icon-left a:before, .icon-cc-by.icon-right a:after { content: "\e7a6"; height: inherit; } - -i.icon-cc-by:before { content: "\e7a6"; height: inherit; } - -.icon-cc-nc.icon-left a:before, .icon-cc-nc.icon-right a:after { content: "\e7a7"; height: inherit; } - -i.icon-cc-nc:before { content: "\e7a7"; height: inherit; } - -.icon-cc-nc-eu.icon-left a:before, .icon-cc-nc-eu.icon-right a:after { content: "\e7a8"; height: inherit; } - -i.icon-cc-nc-eu:before { content: "\e7a8"; height: inherit; } - -.icon-cc-nc-jp.icon-left a:before, .icon-cc-nc-jp.icon-right a:after { content: "\e7a9"; height: inherit; } - -i.icon-cc-nc-jp:before { content: "\e7a9"; height: inherit; } - -.icon-cc-sa.icon-left a:before, .icon-cc-sa.icon-right a:after { content: "\e7aa"; height: inherit; } - -i.icon-cc-sa:before { content: "\e7aa"; height: inherit; } - -.icon-cc-nd.icon-left a:before, .icon-cc-nd.icon-right a:after { content: "\e7ab"; height: inherit; } - -i.icon-cc-nd:before { content: "\e7ab"; height: inherit; } - -.icon-cc-pd.icon-left a:before, .icon-cc-pd.icon-right a:after { content: "\e7ac"; height: inherit; } - -i.icon-cc-pd:before { content: "\e7ac"; height: inherit; } - -.icon-cc-zero.icon-left a:before, .icon-cc-zero.icon-right a:after { content: "\e7ad"; height: inherit; } - -i.icon-cc-zero:before { content: "\e7ad"; height: inherit; } - -.icon-cc-share.icon-left a:before, .icon-cc-share.icon-right a:after { content: "\e7ae"; height: inherit; } - -i.icon-cc-share:before { content: "\e7ae"; height: inherit; } - -.icon-cc-remix.icon-left a:before, .icon-cc-remix.icon-right a:after { content: "\e7af"; height: inherit; } - -i.icon-cc-remix:before { content: "\e7af"; height: inherit; } - -.icon-github.icon-left a:before, .icon-github.icon-right a:after { content: "\f300"; height: inherit; } - -i.icon-github:before { content: "\f300"; height: inherit; } - -.icon-github-circled.icon-left a:before, .icon-github-circled.icon-right a:after { content: "\f301"; height: inherit; } - -i.icon-github-circled:before { content: "\f301"; height: inherit; } - -.icon-flickr.icon-left a:before, .icon-flickr.icon-right a:after { content: "\f303"; height: inherit; } - -i.icon-flickr:before { content: "\f303"; height: inherit; } - -.icon-flickr-circled.icon-left a:before, .icon-flickr-circled.icon-right a:after { content: "\f304"; height: inherit; } - -i.icon-flickr-circled:before { content: "\f304"; height: inherit; } - -.icon-vimeo.icon-left a:before, .icon-vimeo.icon-right a:after { content: "\f306"; height: inherit; } - -i.icon-vimeo:before { content: "\f306"; height: inherit; } - -.icon-vimeo-circled.icon-left a:before, .icon-vimeo-circled.icon-right a:after { content: "\f307"; height: inherit; } - -i.icon-vimeo-circled:before { content: "\f307"; height: inherit; } - -.icon-twitter.icon-left a:before, .icon-twitter.icon-right a:after { content: "\f309"; height: inherit; } - -i.icon-twitter:before { content: "\f309"; height: inherit; } - -.icon-twitter-circled.icon-left a:before, .icon-twitter-circled.icon-right a:after { content: "\f30a"; height: inherit; } - -i.icon-twitter-circled:before { content: "\f30a"; height: inherit; } - -.icon-facebook.icon-left a:before, .icon-facebook.icon-right a:after { content: "\f30c"; height: inherit; } - -i.icon-facebook:before { content: "\f30c"; height: inherit; } - -.icon-facebook-circled.icon-left a:before, .icon-facebook-circled.icon-right a:after { content: "\f30d"; height: inherit; } - -i.icon-facebook-circled:before { content: "\f30d"; height: inherit; } - -.icon-facebook-squared.icon-left a:before, .icon-facebook-squared.icon-right a:after { content: "\f30e"; height: inherit; } - -i.icon-facebook-squared:before { content: "\f30e"; height: inherit; } - -.icon-gplus.icon-left a:before, .icon-gplus.icon-right a:after { content: "\f30f"; height: inherit; } - -i.icon-gplus:before { content: "\f30f"; height: inherit; } - -.icon-gplus-circled.icon-left a:before, .icon-gplus-circled.icon-right a:after { content: "\f310"; height: inherit; } - -i.icon-gplus-circled:before { content: "\f310"; height: inherit; } - -.icon-pinterest.icon-left a:before, .icon-pinterest.icon-right a:after { content: "\f312"; height: inherit; } - -i.icon-pinterest:before { content: "\f312"; height: inherit; } - -.icon-pinterest-circled.icon-left a:before, .icon-pinterest-circled.icon-right a:after { content: "\f313"; height: inherit; } - -i.icon-pinterest-circled:before { content: "\f313"; height: inherit; } - -.icon-tumblr.icon-left a:before, .icon-tumblr.icon-right a:after { content: "\f315"; height: inherit; } - -i.icon-tumblr:before { content: "\f315"; height: inherit; } - -.icon-tumblr-circled.icon-left a:before, .icon-tumblr-circled.icon-right a:after { content: "\f316"; height: inherit; } - -i.icon-tumblr-circled:before { content: "\f316"; height: inherit; } - -.icon-linkedin.icon-left a:before, .icon-linkedin.icon-right a:after { content: "\f318"; height: inherit; } - -i.icon-linkedin:before { content: "\f318"; height: inherit; } - -.icon-linkedin-circled.icon-left a:before, .icon-linkedin-circled.icon-right a:after { content: "\f319"; height: inherit; } - -i.icon-linkedin-circled:before { content: "\f319"; height: inherit; } - -.icon-dribbble.icon-left a:before, .icon-dribbble.icon-right a:after { content: "\f31b"; height: inherit; } - -i.icon-dribbble:before { content: "\f31b"; height: inherit; } - -.icon-dribbble-circled.icon-left a:before, .icon-dribbble-circled.icon-right a:after { content: "\f31c"; height: inherit; } - -i.icon-dribbble-circled:before { content: "\f31c"; height: inherit; } - -.icon-stumbleupon.icon-left a:before, .icon-stumbleupon.icon-right a:after { content: "\f31e"; height: inherit; } - -i.icon-stumbleupon:before { content: "\f31e"; height: inherit; } - -.icon-stumbleupon-circled.icon-left a:before, .icon-stumbleupon-circled.icon-right a:after { content: "\f31f"; height: inherit; } - -i.icon-stumbleupon-circled:before { content: "\f31f"; height: inherit; } - -.icon-lastfm.icon-left a:before, .icon-lastfm.icon-right a:after { content: "\f321"; height: inherit; } - -i.icon-lastfm:before { content: "\f321"; height: inherit; } - -.icon-lastfm-circled.icon-left a:before, .icon-lastfm-circled.icon-right a:after { content: "\f322"; height: inherit; } - -i.icon-lastfm-circled:before { content: "\f322"; height: inherit; } - -.icon-rdio.icon-left a:before, .icon-rdio.icon-right a:after { content: "\f324"; height: inherit; } - -i.icon-rdio:before { content: "\f324"; height: inherit; } - -.icon-rdio-circled.icon-left a:before, .icon-rdio-circled.icon-right a:after { content: "\f325"; height: inherit; } - -i.icon-rdio-circled:before { content: "\f325"; height: inherit; } - -.icon-spotify.icon-left a:before, .icon-spotify.icon-right a:after { content: "\f327"; height: inherit; } - -i.icon-spotify:before { content: "\f327"; height: inherit; } - -.icon-spotify-circled.icon-left a:before, .icon-spotify-circled.icon-right a:after { content: "\f328"; height: inherit; } - -i.icon-spotify-circled:before { content: "\f328"; height: inherit; } - -.icon-qq.icon-left a:before, .icon-qq.icon-right a:after { content: "\f32a"; height: inherit; } - -i.icon-qq:before { content: "\f32a"; height: inherit; } - -.icon-instagram.icon-left a:before, .icon-instagram.icon-right a:after { content: "\f32d"; height: inherit; } - -i.icon-instagram:before { content: "\f32d"; height: inherit; } - -.icon-dropbox.icon-left a:before, .icon-dropbox.icon-right a:after { content: "\f330"; height: inherit; } - -i.icon-dropbox:before { content: "\f330"; height: inherit; } - -.icon-evernote.icon-left a:before, .icon-evernote.icon-right a:after { content: "\f333"; height: inherit; } - -i.icon-evernote:before { content: "\f333"; height: inherit; } - -.icon-flattr.icon-left a:before, .icon-flattr.icon-right a:after { content: "\f336"; height: inherit; } - -i.icon-flattr:before { content: "\f336"; height: inherit; } - -.icon-skype.icon-left a:before, .icon-skype.icon-right a:after { content: "\f339"; height: inherit; } - -i.icon-skype:before { content: "\f339"; height: inherit; } - -.icon-skype-circled.icon-left a:before, .icon-skype-circled.icon-right a:after { content: "\f33a"; height: inherit; } - -i.icon-skype-circled:before { content: "\f33a"; height: inherit; } - -.icon-renren.icon-left a:before, .icon-renren.icon-right a:after { content: "\f33c"; height: inherit; } - -i.icon-renren:before { content: "\f33c"; height: inherit; } - -.icon-sina-weibo.icon-left a:before, .icon-sina-weibo.icon-right a:after { content: "\f33f"; height: inherit; } - -i.icon-sina-weibo:before { content: "\f33f"; height: inherit; } - -.icon-paypal.icon-left a:before, .icon-paypal.icon-right a:after { content: "\f342"; height: inherit; } - -i.icon-paypal:before { content: "\f342"; height: inherit; } - -.icon-picasa.icon-left a:before, .icon-picasa.icon-right a:after { content: "\f345"; height: inherit; } - -i.icon-picasa:before { content: "\f345"; height: inherit; } - -.icon-soundcloud.icon-left a:before, .icon-soundcloud.icon-right a:after { content: "\f348"; height: inherit; } - -i.icon-soundcloud:before { content: "\f348"; height: inherit; } - -.icon-mixi.icon-left a:before, .icon-mixi.icon-right a:after { content: "\f34b"; height: inherit; } - -i.icon-mixi:before { content: "\f34b"; height: inherit; } - -.icon-behance.icon-left a:before, .icon-behance.icon-right a:after { content: "\f34e"; height: inherit; } - -i.icon-behance:before { content: "\f34e"; height: inherit; } - -.icon-google-circles.icon-left a:before, .icon-google-circles.icon-right a:after { content: "\f351"; height: inherit; } - -i.icon-google-circles:before { content: "\f351"; height: inherit; } - -.icon-vkontakte.icon-left a:before, .icon-vkontakte.icon-right a:after { content: "\f354"; height: inherit; } - -i.icon-vkontakte:before { content: "\f354"; height: inherit; } - -.icon-smashing.icon-left a:before, .icon-smashing.icon-right a:after { content: "\f357"; height: inherit; } - -i.icon-smashing:before { content: "\f357"; height: inherit; } - -.icon-sweden.icon-left a:before, .icon-sweden.icon-right a:after { content: "\f601"; height: inherit; } - -i.icon-sweden:before { content: "\f601"; height: inherit; } - -.icon-db-shape.icon-left a:before, .icon-db-shape.icon-right a:after { content: "\f600"; height: inherit; } - -i.icon-db-shape:before { content: "\f600"; height: inherit; } - -.icon-logo-db.icon-left a:before, .icon-logo-db.icon-right a:after { content: "\f603"; height: inherit; } - -i.icon-logo-db:before { content: "\f603"; height: inherit; } - -.fixed { position: fixed; } -.fixed.pinned { position: absolute; } -@media only screen and (max-width: 768px) { .fixed { position: relative !important; top: auto !important; left: auto !important; } } - -.unfixed { position: relative !important; top: auto !important; left: auto !important; } - -.text-center { text-align: center; } - -.text-left { text-align: left; } - -.text-right { text-align: right; } - -/* Fonts */ -@font-face { font-family: "entypo"; font-style: normal; font-weight: 400; src: url(../fonts/icons/entypo.eot); src: url("../fonts/icons/entypo.eot?#iefix") format("ie9-skip-eot"), url("../fonts/icons/entypo.woff") format("woff"), url("../fonts/icons/entypo.ttf") format("truetype"); } - -@font-face { font-family: "entypo"; font-style: normal; font-weight: 400; src: url("./../../fonts/icons/entypo.eot"); src: url("./../../fonts/icons/entypo.eot?#iefix") format("ie9-skip-eot"), url("./../../fonts/icons/entypo.woff") format("woff"), url("./../../fonts/icons/entypo.ttf") format("truetype"); } - -@font-face { font-family: "Merriweather Sans"; font-style: normal; font-weight: 400; src: url("./../../fonts/font_1_pathRegular.ttf") format("truetype"); } - -@font-face { font-family: "Merriweather Sans"; font-style: italic; font-weight: 400; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-Italic.ttf") format("truetype"); } - -@font-face { font-family: "Merriweather Sans"; font-style: normal; font-weight: 300; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-Light.ttf") format("truetype"); } - -@font-face { font-family: "Merriweather Sans"; font-style: italic; font-weight: 300; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-LigthItalic.ttf") format("truetype"); } - -@font-face { font-family: "Merriweather Sans"; font-style: normal; font-weight: 700; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-Bold.ttf") format("truetype"); } - -@font-face { font-family: "Merriweather Sans"; font-style: italic; font-weight: 700; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-BoldItalic.ttf") format("truetype"); } - -@font-face { font-family: "Merriweather Sans"; font-style: normal; font-weight: 800; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-ExtraBold.ttf") format("truetype"); } - -@font-face { font-family: "Merriweather Sans"; font-style: italic; font-weight: 800; src: url("./../../fonts/Merriweather_Sans/MerriweatherSans-ExtraBoldItalic.ttf") format("truetype"); } - -@font-face { font-family: "Oxygen"; font-style: normal; font-weight: 300; src: url("./../../fonts/Oxygen/Oxygen-Light.ttf") format("truetype"); } - -@font-face { font-family: "Oxygen"; font-style: normal; font-weight: 400; src: url("./../../fonts/Oxygen/Oxygen-Regular.ttf") format("truetype"); } - -@font-face { font-family: "Oxygen"; font-style: normal; font-weight: 700; src: url("./../../fonts/Oxygen/Oxygen-Bold.ttf") format("truetype"); } - -h1, h2, h3, h4, h5, h6 { font-family: "Oxygen"; font-weight: 300; color: #444444; text-rendering: optimizeLegibility; padding-top: 0.273em; line-height: 1.15538em; padding-bottom: 0.273em; } -h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { color: #d04526; } - -@media only screen and (max-width: 767px) { h1, h2, h3, h4, h5, h6 { word-wrap: break-word; } } -h1 { font-size: 68px; font-size: 4.25rem; } -h1.xlarge { font-size: 110px; font-size: 6.875rem; } -h1.xxlarge { font-size: 126px; font-size: 7.875rem; } -h1.absurd { font-size: 177px; font-size: 11.0625rem; } - -h2 { font-size: 42px; font-size: 2.625rem; } - -h3 { font-size: 30px; font-size: 1.875rem; } - -h4 { font-size: 26px; font-size: 1.625rem; } - -h5 { font-size: 18px; font-size: 1.125rem; } - -h6 { font-size: 16px; font-size: 1rem; } - -@media only screen and (max-width: 767px) { h1 { font-size: 42px; font-size: 2.625rem; } - h2 { font-size: 36px; font-size: 2.25rem; } } -.subhead { color: #777; font-weight: normal; margin-bottom: 20px; } - -/*===================================================== Links & Paragraph styles ======================================================*/ -p { font-family: "Oxygen"; font-weight: 400; font-size: 16px; font-size: 1rem; margin-bottom: 13px; line-height: 1.625em; } -p.lead { font-size: 20px; font-size: 1.25rem; margin-bottom: 18px; } -@media only screen and (max-width: 768px) { p { font-size: 17.6px; font-size: 1.1rem; line-height: 1.625em; } } - -a { color: #d04526; text-decoration: none; outline: 0; line-height: inherit; } -a:hover { color: #c03d20; } - -/*===================================================== - Lists ======================================================*/ -ul, ol { margin-bottom: 0.273em; } - -ul { list-style: none outside; } - -ol { list-style: decimal; margin-left: 30px; } - -ul.square, ul.circle, ul.disc { margin-left: 25px; } -ul.square { list-style: square outside; } -ul.circle { list-style: circle outside; } -ul.disc { list-style: disc outside; } -ul ul { margin: 4px 0 5px 25px; } - -ol ol { margin: 4px 0 5px 30px; } - -li { padding-bottom: 0.273em; } - -ul.large li { line-height: 21px; } - -dl dt { font-weight: bold; font-size: 16px; font-size: 1rem; } - -@media only screen and (max-width: 768px) { ul, ol, dl, p { text-align: left; } } -/* Mobile */ -em { font-style: italic; line-height: inherit; } - -strong { font-weight: 700; line-height: inherit; } - -small { font-size: 56.4%; line-height: inherit; } - -h1 small, h2 small, h3 small, h4 small, h5 small { color: #777; } - -/* Blockquotes */ -blockquote { line-height: 20px; color: #777; margin: 0 0 18px; padding: 9px 20px 0 19px; border-left: 5px solid #cccccc; } -blockquote p { line-height: 20px; color: #777; } -blockquote cite { display: block; font-size: 12px; font-size: 1.2rem; color: #555555; } -blockquote cite:before { content: "\2014 \0020"; } -blockquote cite a { color: #555555; } -blockquote cite a:visited { color: #555555; } - -hr { border: 1px solid #cccccc; clear: both; margin: 16px 0 18px; height: 0; } - -abbr, acronym { text-transform: uppercase; font-size: 90%; color: #222; border-bottom: 1px solid #cccccc; cursor: help; } - -abbr { text-transform: none; } - -/** Print styles. Inlined to avoid required HTTP connection: www.phpied.com/delay-loading-your-print-css/ Credit to Paul Irish and HTML5 Boilerplate (html5boilerplate.com) */ -@media print { * { background: transparent !important; color: black !important; text-shadow: none !important; filter: none !important; -ms-filter: none !important; } - /* Black prints faster: sanbeiji.com/archives/953 */ - p a { color: #555555 !important; text-decoration: underline; } - p a:visited { color: #555555 !important; text-decoration: underline; } - p a[href]:after { content: " (" attr(href) ")"; } - abbr[title]:after { content: " (" attr(title) ")"; } - .ir a:after { content: ""; } - a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } - /* Don't show links for images, or javascript/internal links */ - pre, blockquote { border: 1px solid #999; page-break-inside: avoid; } - thead { display: table-header-group; } - /* css-discuss.incutio.com/wiki/Printing_Tables */ - tr, img { page-break-inside: avoid; } - @page { margin: 0.5cm; } - p, h2, h3 { orphans: 3; widows: 3; } - h2, h3 { page-break-after: avoid; } } -/*================================================= - +++ LE GRID +++ A Responsive Grid -- Gumby defaults to a standard 960 grid, but you can change it to whatever you'd like. - ==================================================*/ -/*.container { padding: 0 $gutter-in-px; -}*/ -.row { width: 100%; max-width: 980px; min-width: 320px; margin: 0 auto; padding-left: 20px; padding-right: 20px; } -.row .row { min-width: 0; padding-left: 0; padding-right: 0; } - -/* To fix the grid into a different size, set max-width to your desired width */ -.column, .columns { margin-left: 2.12766%; float: left; min-height: 1px; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } - -.column:first-child, .columns:first-child, .alpha { margin-left: 0; } - -.column.omega, .columns.omega { float: right; } - -/* Column Classes */ -.row .one.column { width: 6.38298%; } -.row .one.columns { width: 6.38298%; } -.row .two.columns { width: 14.89362%; } -.row .three.columns { width: 23.40426%; } -.row .four.columns { width: 31.91489%; } -.row .five.columns { width: 40.42553%; } -.row .six.columns { width: 48.93617%; } -.row .seven.columns { width: 57.44681%; } -.row .eight.columns { width: 65.95745%; } -.row .nine.columns { width: 74.46809%; } -.row .ten.columns { width: 82.97872%; } -.row .eleven.columns { width: 91.48936%; } -.row .twelve.columns { width: 100%; } - -/* Push and Pull Classes */ -.row .push_one { margin-left: 10.6383%; } -.row .push_one:first-child { margin-left: 8.51064%; } -.row .pull_one.one.column { margin-left: -14.89362%; } -.row .pull_one.one.column:first-child { margin-left: 0; } -.row .pull_one.two.columns { margin-left: -23.40426%; } -.row .pull_one.two.columns:first-child { margin-left: 0; } -.row .pull_one.three.columns { margin-left: -31.91489%; } -.row .pull_one.three.columns:first-child { margin-left: 0; } -.row .pull_one.four.columns { margin-left: -40.42553%; } -.row .pull_one.four.columns:first-child { margin-left: 0; } -.row .pull_one.five.columns { margin-left: -48.93617%; } -.row .pull_one.five.columns:first-child { margin-left: 0; } -.row .pull_one.six.columns { margin-left: -57.44681%; } -.row .pull_one.six.columns:first-child { margin-left: 0; } -.row .pull_one.seven.columns { margin-left: -65.95745%; } -.row .pull_one.seven.columns:first-child { margin-left: 0; } -.row .pull_one.eight.columns { margin-left: -74.46809%; } -.row .pull_one.eight.columns:first-child { margin-left: 0; } -.row .pull_one.nine.columns { margin-left: -82.97872%; } -.row .pull_one.nine.columns:first-child { margin-left: 0; } -.row .pull_one.ten.columns { margin-left: -91.48936%; } -.row .pull_one.ten.columns:first-child { margin-left: 0; } -.row .pull_one.eleven.columns { margin-left: -100.0%; } -.row .pull_one.eleven.columns:first-child { margin-left: 0; } -.row .push_two { margin-left: 19.14894%; } -.row .push_two:first-child { margin-left: 17.02128%; } -.row .pull_two.one.column { margin-left: -23.40426%; } -.row .pull_two.one.column:first-child { margin-left: 0; } -.row .pull_two.two.columns { margin-left: -31.91489%; } -.row .pull_two.two.columns:first-child { margin-left: 0; } -.row .pull_two.three.columns { margin-left: -40.42553%; } -.row .pull_two.three.columns:first-child { margin-left: 0; } -.row .pull_two.four.columns { margin-left: -48.93617%; } -.row .pull_two.four.columns:first-child { margin-left: 0; } -.row .pull_two.five.columns { margin-left: -57.44681%; } -.row .pull_two.five.columns:first-child { margin-left: 0; } -.row .pull_two.six.columns { margin-left: -65.95745%; } -.row .pull_two.six.columns:first-child { margin-left: 0; } -.row .pull_two.seven.columns { margin-left: -74.46809%; } -.row .pull_two.seven.columns:first-child { margin-left: 0; } -.row .pull_two.eight.columns { margin-left: -82.97872%; } -.row .pull_two.eight.columns:first-child { margin-left: 0; } -.row .pull_two.nine.columns { margin-left: -91.48936%; } -.row .pull_two.nine.columns:first-child { margin-left: 0; } -.row .pull_two.ten.columns { margin-left: -100.0%; } -.row .pull_two.ten.columns:first-child { margin-left: 0; } -.row .pull_two.eleven.columns { margin-left: -108.51064%; } -.row .pull_two.eleven.columns:first-child { margin-left: 0; } -.row .push_three { margin-left: 27.65957%; } -.row .push_three:first-child { margin-left: 25.53191%; } -.row .pull_three.one.column { margin-left: -31.91489%; } -.row .pull_three.one.column:first-child { margin-left: 0; } -.row .pull_three.two.columns { margin-left: -40.42553%; } -.row .pull_three.two.columns:first-child { margin-left: 0; } -.row .pull_three.three.columns { margin-left: -48.93617%; } -.row .pull_three.three.columns:first-child { margin-left: 0; } -.row .pull_three.four.columns { margin-left: -57.44681%; } -.row .pull_three.four.columns:first-child { margin-left: 0; } -.row .pull_three.five.columns { margin-left: -65.95745%; } -.row .pull_three.five.columns:first-child { margin-left: 0; } -.row .pull_three.six.columns { margin-left: -74.46809%; } -.row .pull_three.six.columns:first-child { margin-left: 0; } -.row .pull_three.seven.columns { margin-left: -82.97872%; } -.row .pull_three.seven.columns:first-child { margin-left: 0; } -.row .pull_three.eight.columns { margin-left: -91.48936%; } -.row .pull_three.eight.columns:first-child { margin-left: 0; } -.row .pull_three.nine.columns { margin-left: -100.0%; } -.row .pull_three.nine.columns:first-child { margin-left: 0; } -.row .pull_three.ten.columns { margin-left: -108.51064%; } -.row .pull_three.ten.columns:first-child { margin-left: 0; } -.row .pull_three.eleven.columns { margin-left: -117.02128%; } -.row .pull_three.eleven.columns:first-child { margin-left: 0; } -.row .push_four { margin-left: 36.17021%; } -.row .push_four:first-child { margin-left: 34.04255%; } -.row .pull_four.one.column { margin-left: -40.42553%; } -.row .pull_four.one.column:first-child { margin-left: 0; } -.row .pull_four.two.columns { margin-left: -48.93617%; } -.row .pull_four.two.columns:first-child { margin-left: 0; } -.row .pull_four.three.columns { margin-left: -57.44681%; } -.row .pull_four.three.columns:first-child { margin-left: 0; } -.row .pull_four.four.columns { margin-left: -65.95745%; } -.row .pull_four.four.columns:first-child { margin-left: 0; } -.row .pull_four.five.columns { margin-left: -74.46809%; } -.row .pull_four.five.columns:first-child { margin-left: 0; } -.row .pull_four.six.columns { margin-left: -82.97872%; } -.row .pull_four.six.columns:first-child { margin-left: 0; } -.row .pull_four.seven.columns { margin-left: -91.48936%; } -.row .pull_four.seven.columns:first-child { margin-left: 0; } -.row .pull_four.eight.columns { margin-left: -100.0%; } -.row .pull_four.eight.columns:first-child { margin-left: 0; } -.row .pull_four.nine.columns { margin-left: -108.51064%; } -.row .pull_four.nine.columns:first-child { margin-left: 0; } -.row .pull_four.ten.columns { margin-left: -117.02128%; } -.row .pull_four.ten.columns:first-child { margin-left: 0; } -.row .pull_four.eleven.columns { margin-left: -125.53191%; } -.row .pull_four.eleven.columns:first-child { margin-left: 0; } -.row .push_five { margin-left: 44.68085%; } -.row .push_five:first-child { margin-left: 42.55319%; } -.row .pull_five.one.column { margin-left: -48.93617%; } -.row .pull_five.one.column:first-child { margin-left: 0; } -.row .pull_five.two.columns { margin-left: -57.44681%; } -.row .pull_five.two.columns:first-child { margin-left: 0; } -.row .pull_five.three.columns { margin-left: -65.95745%; } -.row .pull_five.three.columns:first-child { margin-left: 0; } -.row .pull_five.four.columns { margin-left: -74.46809%; } -.row .pull_five.four.columns:first-child { margin-left: 0; } -.row .pull_five.five.columns { margin-left: -82.97872%; } -.row .pull_five.five.columns:first-child { margin-left: 0; } -.row .pull_five.six.columns { margin-left: -91.48936%; } -.row .pull_five.six.columns:first-child { margin-left: 0; } -.row .pull_five.seven.columns { margin-left: -100.0%; } -.row .pull_five.seven.columns:first-child { margin-left: 0; } -.row .pull_five.eight.columns { margin-left: -108.51064%; } -.row .pull_five.eight.columns:first-child { margin-left: 0; } -.row .pull_five.nine.columns { margin-left: -117.02128%; } -.row .pull_five.nine.columns:first-child { margin-left: 0; } -.row .pull_five.ten.columns { margin-left: -125.53191%; } -.row .pull_five.ten.columns:first-child { margin-left: 0; } -.row .pull_five.eleven.columns { margin-left: -134.04255%; } -.row .pull_five.eleven.columns:first-child { margin-left: 0; } -.row .push_six { margin-left: 53.19149%; } -.row .push_six:first-child { margin-left: 51.06383%; } -.row .pull_six.one.column { margin-left: -57.44681%; } -.row .pull_six.one.column:first-child { margin-left: 0; } -.row .pull_six.two.columns { margin-left: -65.95745%; } -.row .pull_six.two.columns:first-child { margin-left: 0; } -.row .pull_six.three.columns { margin-left: -74.46809%; } -.row .pull_six.three.columns:first-child { margin-left: 0; } -.row .pull_six.four.columns { margin-left: -82.97872%; } -.row .pull_six.four.columns:first-child { margin-left: 0; } -.row .pull_six.five.columns { margin-left: -91.48936%; } -.row .pull_six.five.columns:first-child { margin-left: 0; } -.row .pull_six.six.columns { margin-left: -100.0%; } -.row .pull_six.six.columns:first-child { margin-left: 0; } -.row .pull_six.seven.columns { margin-left: -108.51064%; } -.row .pull_six.seven.columns:first-child { margin-left: 0; } -.row .pull_six.eight.columns { margin-left: -117.02128%; } -.row .pull_six.eight.columns:first-child { margin-left: 0; } -.row .pull_six.nine.columns { margin-left: -125.53191%; } -.row .pull_six.nine.columns:first-child { margin-left: 0; } -.row .pull_six.ten.columns { margin-left: -134.04255%; } -.row .pull_six.ten.columns:first-child { margin-left: 0; } -.row .pull_six.eleven.columns { margin-left: -142.55319%; } -.row .pull_six.eleven.columns:first-child { margin-left: 0; } -.row .push_seven { margin-left: 61.70213%; } -.row .push_seven:first-child { margin-left: 59.57447%; } -.row .pull_seven.one.column { margin-left: -65.95745%; } -.row .pull_seven.one.column:first-child { margin-left: 0; } -.row .pull_seven.two.columns { margin-left: -74.46809%; } -.row .pull_seven.two.columns:first-child { margin-left: 0; } -.row .pull_seven.three.columns { margin-left: -82.97872%; } -.row .pull_seven.three.columns:first-child { margin-left: 0; } -.row .pull_seven.four.columns { margin-left: -91.48936%; } -.row .pull_seven.four.columns:first-child { margin-left: 0; } -.row .pull_seven.five.columns { margin-left: -100.0%; } -.row .pull_seven.five.columns:first-child { margin-left: 0; } -.row .pull_seven.six.columns { margin-left: -108.51064%; } -.row .pull_seven.six.columns:first-child { margin-left: 0; } -.row .pull_seven.seven.columns { margin-left: -117.02128%; } -.row .pull_seven.seven.columns:first-child { margin-left: 0; } -.row .pull_seven.eight.columns { margin-left: -125.53191%; } -.row .pull_seven.eight.columns:first-child { margin-left: 0; } -.row .pull_seven.nine.columns { margin-left: -134.04255%; } -.row .pull_seven.nine.columns:first-child { margin-left: 0; } -.row .pull_seven.ten.columns { margin-left: -142.55319%; } -.row .pull_seven.ten.columns:first-child { margin-left: 0; } -.row .pull_seven.eleven.columns { margin-left: -151.06383%; } -.row .pull_seven.eleven.columns:first-child { margin-left: 0; } -.row .push_eight { margin-left: 70.21277%; } -.row .push_eight:first-child { margin-left: 68.08511%; } -.row .pull_eight.one.column { margin-left: -74.46809%; } -.row .pull_eight.one.column:first-child { margin-left: 0; } -.row .pull_eight.two.columns { margin-left: -82.97872%; } -.row .pull_eight.two.columns:first-child { margin-left: 0; } -.row .pull_eight.three.columns { margin-left: -91.48936%; } -.row .pull_eight.three.columns:first-child { margin-left: 0; } -.row .pull_eight.four.columns { margin-left: -100.0%; } -.row .pull_eight.four.columns:first-child { margin-left: 0; } -.row .pull_eight.five.columns { margin-left: -108.51064%; } -.row .pull_eight.five.columns:first-child { margin-left: 0; } -.row .pull_eight.six.columns { margin-left: -117.02128%; } -.row .pull_eight.six.columns:first-child { margin-left: 0; } -.row .pull_eight.seven.columns { margin-left: -125.53191%; } -.row .pull_eight.seven.columns:first-child { margin-left: 0; } -.row .pull_eight.eight.columns { margin-left: -134.04255%; } -.row .pull_eight.eight.columns:first-child { margin-left: 0; } -.row .pull_eight.nine.columns { margin-left: -142.55319%; } -.row .pull_eight.nine.columns:first-child { margin-left: 0; } -.row .pull_eight.ten.columns { margin-left: -151.06383%; } -.row .pull_eight.ten.columns:first-child { margin-left: 0; } -.row .pull_eight.eleven.columns { margin-left: -159.57447%; } -.row .pull_eight.eleven.columns:first-child { margin-left: 0; } -.row .push_nine { margin-left: 78.7234%; } -.row .push_nine:first-child { margin-left: 76.59574%; } -.row .pull_nine.one.column { margin-left: -82.97872%; } -.row .pull_nine.one.column:first-child { margin-left: 0; } -.row .pull_nine.two.columns { margin-left: -91.48936%; } -.row .pull_nine.two.columns:first-child { margin-left: 0; } -.row .pull_nine.three.columns { margin-left: -100.0%; } -.row .pull_nine.three.columns:first-child { margin-left: 0; } -.row .pull_nine.four.columns { margin-left: -108.51064%; } -.row .pull_nine.four.columns:first-child { margin-left: 0; } -.row .pull_nine.five.columns { margin-left: -117.02128%; } -.row .pull_nine.five.columns:first-child { margin-left: 0; } -.row .pull_nine.six.columns { margin-left: -125.53191%; } -.row .pull_nine.six.columns:first-child { margin-left: 0; } -.row .pull_nine.seven.columns { margin-left: -134.04255%; } -.row .pull_nine.seven.columns:first-child { margin-left: 0; } -.row .pull_nine.eight.columns { margin-left: -142.55319%; } -.row .pull_nine.eight.columns:first-child { margin-left: 0; } -.row .pull_nine.nine.columns { margin-left: -151.06383%; } -.row .pull_nine.nine.columns:first-child { margin-left: 0; } -.row .pull_nine.ten.columns { margin-left: -159.57447%; } -.row .pull_nine.ten.columns:first-child { margin-left: 0; } -.row .pull_nine.eleven.columns { margin-left: -168.08511%; } -.row .pull_nine.eleven.columns:first-child { margin-left: 0; } -.row .push_ten { margin-left: 87.23404%; } -.row .push_ten:first-child { margin-left: 85.10638%; } -.row .pull_ten.one.column { margin-left: -91.48936%; } -.row .pull_ten.one.column:first-child { margin-left: 0; } -.row .pull_ten.two.columns { margin-left: -100.0%; } -.row .pull_ten.two.columns:first-child { margin-left: 0; } -.row .pull_ten.three.columns { margin-left: -108.51064%; } -.row .pull_ten.three.columns:first-child { margin-left: 0; } -.row .pull_ten.four.columns { margin-left: -117.02128%; } -.row .pull_ten.four.columns:first-child { margin-left: 0; } -.row .pull_ten.five.columns { margin-left: -125.53191%; } -.row .pull_ten.five.columns:first-child { margin-left: 0; } -.row .pull_ten.six.columns { margin-left: -134.04255%; } -.row .pull_ten.six.columns:first-child { margin-left: 0; } -.row .pull_ten.seven.columns { margin-left: -142.55319%; } -.row .pull_ten.seven.columns:first-child { margin-left: 0; } -.row .pull_ten.eight.columns { margin-left: -151.06383%; } -.row .pull_ten.eight.columns:first-child { margin-left: 0; } -.row .pull_ten.nine.columns { margin-left: -159.57447%; } -.row .pull_ten.nine.columns:first-child { margin-left: 0; } -.row .pull_ten.ten.columns { margin-left: -168.08511%; } -.row .pull_ten.ten.columns:first-child { margin-left: 0; } -.row .pull_ten.eleven.columns { margin-left: -176.59574%; } -.row .pull_ten.eleven.columns:first-child { margin-left: 0; } -.row .push_eleven { margin-left: 95.74468%; } -.row .push_eleven:first-child { margin-left: 93.61702%; } -.row .pull_eleven.one.column { margin-left: -100.0%; } -.row .pull_eleven.one.column:first-child { margin-left: 0; } -.row .pull_eleven.two.columns { margin-left: -108.51064%; } -.row .pull_eleven.two.columns:first-child { margin-left: 0; } -.row .pull_eleven.three.columns { margin-left: -117.02128%; } -.row .pull_eleven.three.columns:first-child { margin-left: 0; } -.row .pull_eleven.four.columns { margin-left: -125.53191%; } -.row .pull_eleven.four.columns:first-child { margin-left: 0; } -.row .pull_eleven.five.columns { margin-left: -134.04255%; } -.row .pull_eleven.five.columns:first-child { margin-left: 0; } -.row .pull_eleven.six.columns { margin-left: -142.55319%; } -.row .pull_eleven.six.columns:first-child { margin-left: 0; } -.row .pull_eleven.seven.columns { margin-left: -151.06383%; } -.row .pull_eleven.seven.columns:first-child { margin-left: 0; } -.row .pull_eleven.eight.columns { margin-left: -159.57447%; } -.row .pull_eleven.eight.columns:first-child { margin-left: 0; } -.row .pull_eleven.nine.columns { margin-left: -168.08511%; } -.row .pull_eleven.nine.columns:first-child { margin-left: 0; } -.row .pull_eleven.ten.columns { margin-left: -176.59574%; } -.row .pull_eleven.ten.columns:first-child { margin-left: 0; } -.row .pull_eleven.eleven.columns { margin-left: -185.10638%; } -.row .pull_eleven.eleven.columns:first-child { margin-left: 0; } - -/* Centered Classes */ -.row .one.centered { margin-left: 46.80851%; } -.row .two.centered { margin-left: 42.55319%; } -.row .three.centered { margin-left: 38.29787%; } -.row .four.centered { margin-left: 34.04255%; } -.row .five.centered { margin-left: 29.78723%; } -.row .six.centered { margin-left: 25.53191%; } -.row .seven.centered { margin-left: 21.2766%; } -.row .eight.centered { margin-left: 17.02128%; } -.row .nine.centered { margin-left: 12.76596%; } -.row .ten.centered { margin-left: 8.51064%; } -.row .eleven.centered { margin-left: 4.25532%; } - -/* Hybrid Grid Columns */ -.sixteen.colgrid .row .one.column { width: 4.25532%; } -.sixteen.colgrid .row .one.columns { width: 4.25532%; } -.sixteen.colgrid .row .two.columns { width: 10.6383%; } -.sixteen.colgrid .row .three.columns { width: 17.02128%; } -.sixteen.colgrid .row .four.columns { width: 23.40426%; } -.sixteen.colgrid .row .five.columns { width: 29.78723%; } -.sixteen.colgrid .row .six.columns { width: 36.17021%; } -.sixteen.colgrid .row .seven.columns { width: 42.55319%; } -.sixteen.colgrid .row .eight.columns { width: 48.93617%; } -.sixteen.colgrid .row .nine.columns { width: 55.31915%; } -.sixteen.colgrid .row .ten.columns { width: 61.70213%; } -.sixteen.colgrid .row .eleven.columns { width: 68.08511%; } -.sixteen.colgrid .row .twelve.columns { width: 74.46809%; } -.sixteen.colgrid .row .thirteen.columns { width: 80.85106%; } -.sixteen.colgrid .row .fourteen.columns { width: 87.23404%; } -.sixteen.colgrid .row .fifteen.columns { width: 93.61702%; } -.sixteen.colgrid .row .sixteen.columns { width: 100%; } - -/* Hybrid Push and Pull Classes */ -.sixteen.colgrid .row .push_one { margin-left: 8.51064%; } -.sixteen.colgrid .row .push_one:first-child { margin-left: 6.38298%; } -.sixteen.colgrid .row .pull_one.one.column { margin-left: -10.6383%; } -.sixteen.colgrid .row .pull_one.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.two.columns { margin-left: -17.02128%; } -.sixteen.colgrid .row .pull_one.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.three.columns { margin-left: -23.40426%; } -.sixteen.colgrid .row .pull_one.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.four.columns { margin-left: -29.78723%; } -.sixteen.colgrid .row .pull_one.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.five.columns { margin-left: -36.17021%; } -.sixteen.colgrid .row .pull_one.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.six.columns { margin-left: -42.55319%; } -.sixteen.colgrid .row .pull_one.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.seven.columns { margin-left: -48.93617%; } -.sixteen.colgrid .row .pull_one.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.eight.columns { margin-left: -55.31915%; } -.sixteen.colgrid .row .pull_one.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.nine.columns { margin-left: -61.70213%; } -.sixteen.colgrid .row .pull_one.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.ten.columns { margin-left: -68.08511%; } -.sixteen.colgrid .row .pull_one.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.eleven.columns { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_one.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.twelve.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_one.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.thirteen.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_one.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.fourteen.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_one.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_one.fifteen.columns { margin-left: -100%; } -.sixteen.colgrid .row .pull_one.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_two { margin-left: 14.89362%; } -.sixteen.colgrid .row .push_two:first-child { margin-left: 12.76596%; } -.sixteen.colgrid .row .pull_two.one.column { margin-left: -17.02128%; } -.sixteen.colgrid .row .pull_two.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.two.columns { margin-left: -23.40426%; } -.sixteen.colgrid .row .pull_two.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.three.columns { margin-left: -29.78723%; } -.sixteen.colgrid .row .pull_two.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.four.columns { margin-left: -36.17021%; } -.sixteen.colgrid .row .pull_two.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.five.columns { margin-left: -42.55319%; } -.sixteen.colgrid .row .pull_two.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.six.columns { margin-left: -48.93617%; } -.sixteen.colgrid .row .pull_two.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.seven.columns { margin-left: -55.31915%; } -.sixteen.colgrid .row .pull_two.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.eight.columns { margin-left: -61.70213%; } -.sixteen.colgrid .row .pull_two.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.nine.columns { margin-left: -68.08511%; } -.sixteen.colgrid .row .pull_two.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.ten.columns { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_two.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.eleven.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_two.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.twelve.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_two.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.thirteen.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_two.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.fourteen.columns { margin-left: -100%; } -.sixteen.colgrid .row .pull_two.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_two.fifteen.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_two.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_three { margin-left: 21.2766%; } -.sixteen.colgrid .row .push_three:first-child { margin-left: 19.14894%; } -.sixteen.colgrid .row .pull_three.one.column { margin-left: -23.40426%; } -.sixteen.colgrid .row .pull_three.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.two.columns { margin-left: -29.78723%; } -.sixteen.colgrid .row .pull_three.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.three.columns { margin-left: -36.17021%; } -.sixteen.colgrid .row .pull_three.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.four.columns { margin-left: -42.55319%; } -.sixteen.colgrid .row .pull_three.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.five.columns { margin-left: -48.93617%; } -.sixteen.colgrid .row .pull_three.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.six.columns { margin-left: -55.31915%; } -.sixteen.colgrid .row .pull_three.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.seven.columns { margin-left: -61.70213%; } -.sixteen.colgrid .row .pull_three.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.eight.columns { margin-left: -68.08511%; } -.sixteen.colgrid .row .pull_three.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.nine.columns { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_three.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.ten.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_three.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.eleven.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_three.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.twelve.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_three.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.thirteen.columns { margin-left: -100%; } -.sixteen.colgrid .row .pull_three.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.fourteen.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_three.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_three.fifteen.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_three.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_four { margin-left: 27.65957%; } -.sixteen.colgrid .row .push_four:first-child { margin-left: 25.53191%; } -.sixteen.colgrid .row .pull_four.one.column { margin-left: -29.78723%; } -.sixteen.colgrid .row .pull_four.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.two.columns { margin-left: -36.17021%; } -.sixteen.colgrid .row .pull_four.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.three.columns { margin-left: -42.55319%; } -.sixteen.colgrid .row .pull_four.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.four.columns { margin-left: -48.93617%; } -.sixteen.colgrid .row .pull_four.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.five.columns { margin-left: -55.31915%; } -.sixteen.colgrid .row .pull_four.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.six.columns { margin-left: -61.70213%; } -.sixteen.colgrid .row .pull_four.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.seven.columns { margin-left: -68.08511%; } -.sixteen.colgrid .row .pull_four.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.eight.columns { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_four.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.nine.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_four.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.ten.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_four.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.eleven.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_four.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.twelve.columns { margin-left: -100%; } -.sixteen.colgrid .row .pull_four.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.thirteen.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_four.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.fourteen.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_four.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_four.fifteen.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_four.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_five { margin-left: 34.04255%; } -.sixteen.colgrid .row .push_five:first-child { margin-left: 31.91489%; } -.sixteen.colgrid .row .pull_five.one.column { margin-left: -36.17021%; } -.sixteen.colgrid .row .pull_five.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.two.columns { margin-left: -42.55319%; } -.sixteen.colgrid .row .pull_five.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.three.columns { margin-left: -48.93617%; } -.sixteen.colgrid .row .pull_five.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.four.columns { margin-left: -55.31915%; } -.sixteen.colgrid .row .pull_five.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.five.columns { margin-left: -61.70213%; } -.sixteen.colgrid .row .pull_five.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.six.columns { margin-left: -68.08511%; } -.sixteen.colgrid .row .pull_five.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.seven.columns { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_five.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.eight.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_five.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.nine.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_five.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.ten.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_five.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.eleven.columns { margin-left: -100%; } -.sixteen.colgrid .row .pull_five.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.twelve.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_five.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.thirteen.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_five.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.fourteen.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_five.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_five.fifteen.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_five.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_six { margin-left: 40.42553%; } -.sixteen.colgrid .row .push_six:first-child { margin-left: 38.29787%; } -.sixteen.colgrid .row .pull_six.one.column { margin-left: -42.55319%; } -.sixteen.colgrid .row .pull_six.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.two.columns { margin-left: -48.93617%; } -.sixteen.colgrid .row .pull_six.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.three.columns { margin-left: -55.31915%; } -.sixteen.colgrid .row .pull_six.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.four.columns { margin-left: -61.70213%; } -.sixteen.colgrid .row .pull_six.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.five.columns { margin-left: -68.08511%; } -.sixteen.colgrid .row .pull_six.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.six.columns { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_six.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.seven.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_six.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.eight.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_six.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.nine.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_six.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.ten.columns { margin-left: -100.0%; } -.sixteen.colgrid .row .pull_six.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.eleven.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_six.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.twelve.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_six.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.thirteen.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_six.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.fourteen.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_six.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_six.fifteen.columns { margin-left: -131.91489%; } -.sixteen.colgrid .row .pull_six.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_seven { margin-left: 46.80851%; } -.sixteen.colgrid .row .push_seven:first-child { margin-left: 44.68085%; } -.sixteen.colgrid .row .pull_seven.one.column { margin-left: -48.93617%; } -.sixteen.colgrid .row .pull_seven.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.two.columns { margin-left: -55.31915%; } -.sixteen.colgrid .row .pull_seven.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.three.columns { margin-left: -61.70213%; } -.sixteen.colgrid .row .pull_seven.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.four.columns { margin-left: -68.08511%; } -.sixteen.colgrid .row .pull_seven.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.five.columns { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_seven.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.six.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_seven.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.seven.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_seven.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.eight.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_seven.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.nine.columns { margin-left: -100.0%; } -.sixteen.colgrid .row .pull_seven.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.ten.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_seven.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.eleven.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_seven.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.twelve.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_seven.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.thirteen.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_seven.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.fourteen.columns { margin-left: -131.91489%; } -.sixteen.colgrid .row .pull_seven.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_seven.fifteen.columns { margin-left: -138.29787%; } -.sixteen.colgrid .row .pull_seven.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_eight { margin-left: 53.19149%; } -.sixteen.colgrid .row .push_eight:first-child { margin-left: 51.06383%; } -.sixteen.colgrid .row .pull_eight.one.column { margin-left: -55.31915%; } -.sixteen.colgrid .row .pull_eight.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.two.columns { margin-left: -61.70213%; } -.sixteen.colgrid .row .pull_eight.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.three.columns { margin-left: -68.08511%; } -.sixteen.colgrid .row .pull_eight.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.four.columns { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_eight.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.five.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_eight.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.six.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_eight.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.seven.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_eight.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.eight.columns { margin-left: -100%; } -.sixteen.colgrid .row .pull_eight.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.nine.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_eight.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.ten.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_eight.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.eleven.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_eight.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.twelve.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_eight.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.thirteen.columns { margin-left: -131.91489%; } -.sixteen.colgrid .row .pull_eight.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.fourteen.columns { margin-left: -138.29787%; } -.sixteen.colgrid .row .pull_eight.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eight.fifteen.columns { margin-left: -144.68085%; } -.sixteen.colgrid .row .pull_eight.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_nine { margin-left: 59.57447%; } -.sixteen.colgrid .row .push_nine:first-child { margin-left: 57.44681%; } -.sixteen.colgrid .row .pull_nine.one.column { margin-left: -61.70213%; } -.sixteen.colgrid .row .pull_nine.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.two.columns { margin-left: -68.08511%; } -.sixteen.colgrid .row .pull_nine.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.three.columns { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_nine.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.four.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_nine.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.five.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_nine.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.six.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_nine.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.seven.columns { margin-left: -100%; } -.sixteen.colgrid .row .pull_nine.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.eight.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_nine.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.nine.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_nine.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.ten.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_nine.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.eleven.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_nine.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.twelve.columns { margin-left: -131.91489%; } -.sixteen.colgrid .row .pull_nine.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.thirteen.columns { margin-left: -138.29787%; } -.sixteen.colgrid .row .pull_nine.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.fourteen.columns { margin-left: -144.68085%; } -.sixteen.colgrid .row .pull_nine.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_nine.fifteen.columns { margin-left: -151.06383%; } -.sixteen.colgrid .row .pull_nine.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_ten { margin-left: 65.95745%; } -.sixteen.colgrid .row .push_ten:first-child { margin-left: 63.82979%; } -.sixteen.colgrid .row .pull_ten.one.column { margin-left: -68.08511%; } -.sixteen.colgrid .row .pull_ten.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.two.columns { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_ten.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.three.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_ten.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.four.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_ten.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.five.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_ten.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.six.columns { margin-left: -100%; } -.sixteen.colgrid .row .pull_ten.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.seven.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_ten.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.eight.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_ten.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.nine.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_ten.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.ten.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_ten.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.eleven.columns { margin-left: -131.91489%; } -.sixteen.colgrid .row .pull_ten.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.twelve.columns { margin-left: -138.29787%; } -.sixteen.colgrid .row .pull_ten.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.thirteen.columns { margin-left: -144.68085%; } -.sixteen.colgrid .row .pull_ten.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.fourteen.columns { margin-left: -151.06383%; } -.sixteen.colgrid .row .pull_ten.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_ten.fifteen.columns { margin-left: -157.44681%; } -.sixteen.colgrid .row .pull_ten.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_eleven { margin-left: 72.34043%; } -.sixteen.colgrid .row .push_eleven:first-child { margin-left: 70.21277%; } -.sixteen.colgrid .row .pull_eleven.one.column { margin-left: -74.46809%; } -.sixteen.colgrid .row .pull_eleven.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.two.columns { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_eleven.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.three.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_eleven.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.four.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_eleven.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.five.columns { margin-left: -100%; } -.sixteen.colgrid .row .pull_eleven.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.six.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_eleven.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.seven.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_eleven.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.eight.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_eleven.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.nine.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_eleven.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.ten.columns { margin-left: -131.91489%; } -.sixteen.colgrid .row .pull_eleven.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.eleven.columns { margin-left: -138.29787%; } -.sixteen.colgrid .row .pull_eleven.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.twelve.columns { margin-left: -144.68085%; } -.sixteen.colgrid .row .pull_eleven.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.thirteen.columns { margin-left: -151.06383%; } -.sixteen.colgrid .row .pull_eleven.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.fourteen.columns { margin-left: -157.44681%; } -.sixteen.colgrid .row .pull_eleven.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_eleven.fifteen.columns { margin-left: -163.82979%; } -.sixteen.colgrid .row .pull_eleven.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_twelve { margin-left: 78.7234%; } -.sixteen.colgrid .row .push_twelve:first-child { margin-left: 76.59574%; } -.sixteen.colgrid .row .pull_twelve.one.column { margin-left: -80.85106%; } -.sixteen.colgrid .row .pull_twelve.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.two.columns { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_twelve.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.three.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_twelve.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.four.columns { margin-left: -100.0%; } -.sixteen.colgrid .row .pull_twelve.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.five.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_twelve.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.six.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_twelve.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.seven.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_twelve.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.eight.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_twelve.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.nine.columns { margin-left: -131.91489%; } -.sixteen.colgrid .row .pull_twelve.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.ten.columns { margin-left: -138.29787%; } -.sixteen.colgrid .row .pull_twelve.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.eleven.columns { margin-left: -144.68085%; } -.sixteen.colgrid .row .pull_twelve.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.twelve.columns { margin-left: -151.06383%; } -.sixteen.colgrid .row .pull_twelve.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.thirteen.columns { margin-left: -157.44681%; } -.sixteen.colgrid .row .pull_twelve.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.fourteen.columns { margin-left: -163.82979%; } -.sixteen.colgrid .row .pull_twelve.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_twelve.fifteen.columns { margin-left: -170.21277%; } -.sixteen.colgrid .row .pull_twelve.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_thirteen { margin-left: 85.10638%; } -.sixteen.colgrid .row .push_thirteen:first-child { margin-left: 82.97872%; } -.sixteen.colgrid .row .pull_thirteen.one.column { margin-left: -87.23404%; } -.sixteen.colgrid .row .pull_thirteen.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.two.columns { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_thirteen.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.three.columns { margin-left: -100.0%; } -.sixteen.colgrid .row .pull_thirteen.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.four.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_thirteen.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.five.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_thirteen.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.six.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_thirteen.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.seven.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_thirteen.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.eight.columns { margin-left: -131.91489%; } -.sixteen.colgrid .row .pull_thirteen.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.nine.columns { margin-left: -138.29787%; } -.sixteen.colgrid .row .pull_thirteen.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.ten.columns { margin-left: -144.68085%; } -.sixteen.colgrid .row .pull_thirteen.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.eleven.columns { margin-left: -151.06383%; } -.sixteen.colgrid .row .pull_thirteen.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.twelve.columns { margin-left: -157.44681%; } -.sixteen.colgrid .row .pull_thirteen.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.thirteen.columns { margin-left: -163.82979%; } -.sixteen.colgrid .row .pull_thirteen.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.fourteen.columns { margin-left: -170.21277%; } -.sixteen.colgrid .row .pull_thirteen.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_thirteen.fifteen.columns { margin-left: -176.59574%; } -.sixteen.colgrid .row .pull_thirteen.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_fourteen { margin-left: 91.48936%; } -.sixteen.colgrid .row .push_fourteen:first-child { margin-left: 89.3617%; } -.sixteen.colgrid .row .pull_fourteen.one.column { margin-left: -93.61702%; } -.sixteen.colgrid .row .pull_fourteen.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.two.columns { margin-left: -100%; } -.sixteen.colgrid .row .pull_fourteen.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.three.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_fourteen.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.four.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_fourteen.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.five.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_fourteen.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.six.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_fourteen.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.seven.columns { margin-left: -131.91489%; } -.sixteen.colgrid .row .pull_fourteen.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.eight.columns { margin-left: -138.29787%; } -.sixteen.colgrid .row .pull_fourteen.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.nine.columns { margin-left: -144.68085%; } -.sixteen.colgrid .row .pull_fourteen.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.ten.columns { margin-left: -151.06383%; } -.sixteen.colgrid .row .pull_fourteen.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.eleven.columns { margin-left: -157.44681%; } -.sixteen.colgrid .row .pull_fourteen.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.twelve.columns { margin-left: -163.82979%; } -.sixteen.colgrid .row .pull_fourteen.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.thirteen.columns { margin-left: -170.21277%; } -.sixteen.colgrid .row .pull_fourteen.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.fourteen.columns { margin-left: -176.59574%; } -.sixteen.colgrid .row .pull_fourteen.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fourteen.fifteen.columns { margin-left: -182.97872%; } -.sixteen.colgrid .row .pull_fourteen.fifteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .push_fifteen { margin-left: 97.87234%; } -.sixteen.colgrid .row .push_fifteen:first-child { margin-left: 95.74468%; } -.sixteen.colgrid .row .pull_fifteen.one.column { margin-left: -100%; } -.sixteen.colgrid .row .pull_fifteen.one.column:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.two.columns { margin-left: -106.38298%; } -.sixteen.colgrid .row .pull_fifteen.two.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.three.columns { margin-left: -112.76596%; } -.sixteen.colgrid .row .pull_fifteen.three.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.four.columns { margin-left: -119.14894%; } -.sixteen.colgrid .row .pull_fifteen.four.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.five.columns { margin-left: -125.53191%; } -.sixteen.colgrid .row .pull_fifteen.five.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.six.columns { margin-left: -131.91489%; } -.sixteen.colgrid .row .pull_fifteen.six.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.seven.columns { margin-left: -138.29787%; } -.sixteen.colgrid .row .pull_fifteen.seven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.eight.columns { margin-left: -144.68085%; } -.sixteen.colgrid .row .pull_fifteen.eight.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.nine.columns { margin-left: -151.06383%; } -.sixteen.colgrid .row .pull_fifteen.nine.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.ten.columns { margin-left: -157.44681%; } -.sixteen.colgrid .row .pull_fifteen.ten.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.eleven.columns { margin-left: -163.82979%; } -.sixteen.colgrid .row .pull_fifteen.eleven.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.twelve.columns { margin-left: -170.21277%; } -.sixteen.colgrid .row .pull_fifteen.twelve.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.thirteen.columns { margin-left: -176.59574%; } -.sixteen.colgrid .row .pull_fifteen.thirteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.fourteen.columns { margin-left: -182.97872%; } -.sixteen.colgrid .row .pull_fifteen.fourteen.columns:first-child { margin-left: 0; } -.sixteen.colgrid .row .pull_fifteen.fifteen.columns { margin-left: -189.3617%; } -.sixteen.colgrid .row .pull_fifteen.fifteen.columns:first-child { margin-left: 0; } - -/* Hybrid Centered Classes */ -.sixteen.colgrid .row .one.centered { margin-left: 47.87234%; } -.sixteen.colgrid .row .two.centered { margin-left: 44.68085%; } -.sixteen.colgrid .row .three.centered { margin-left: 41.48936%; } -.sixteen.colgrid .row .four.centered { margin-left: 38.29787%; } -.sixteen.colgrid .row .five.centered { margin-left: 35.10638%; } -.sixteen.colgrid .row .six.centered { margin-left: 31.91489%; } -.sixteen.colgrid .row .seven.centered { margin-left: 28.7234%; } -.sixteen.colgrid .row .eight.centered { margin-left: 25.53191%; } -.sixteen.colgrid .row .nine.centered { margin-left: 22.34043%; } -.sixteen.colgrid .row .ten.centered { margin-left: 19.14894%; } -.sixteen.colgrid .row .eleven.centered { margin-left: 15.95745%; } -.sixteen.colgrid .row .twelve.centered { margin-left: 12.76596%; } -.sixteen.colgrid .row .thirteen.centered { margin-left: 9.57447%; } -.sixteen.colgrid .row .fourteen.centered { margin-left: 6.38298%; } -.sixteen.colgrid .row .fifteen.centered { margin-left: 3.19149%; } - -img, object, embed { max-width: 100%; height: auto; } - -img { -ms-interpolation-mode: bicubic; } - -#map_canvas img, .map_canvas img { max-width: none !important; } - -/* Tile Grid */ -.tiles { display: block; overflow: hidden; } -.tiles > li { display: block; height: auto; float: left; padding-bottom: 0; } -.tiles.two_up { margin-left: -4%; } -.tiles.two_up > li { margin-left: 4%; width: 46%; } -.tiles.three_up, .tiles.four_up { margin-left: -2%; } -.tiles.three_up > li { margin-left: 2%; width: 31.3%; } -.tiles.four_up > li { margin-left: 2%; width: 23%; } -.tiles.five_up { margin-left: -1.5%; } -.tiles.five_up > li { margin-left: 1.5%; width: 18.5%; } - -/* Nicolas Gallagher's micro clearfix */ -.clearfix { *zoom: 1; } -.clearfix:before, .clearfix:after { content: ""; display: table; } -.clearfix:after { clear: both; } - -.row { *zoom: 1; } -.row:before, .row:after { content: ""; display: table; } -.row:after { clear: both; } - -.valign { display: table; width: 100%; } -.valign > div, .valign > article, .valign > section, .valign > figure { display: table-cell; vertical-align: middle; } - -/* Mobile */ -@media only screen and (max-width: 767px) { body { -webkit-text-size-adjust: none; -ms-text-size-adjust: none; width: 100%; min-width: 0; } - .container { min-width: 0; margin-left: 0; margin-right: 0; } - .row { width: 100%; min-width: 0; margin-left: 0; margin-right: 0; } - .row .row .column, .row .row .columns { padding: 0; } - .row .centered { margin-left: 0 !important; } - .column, .columns { width: auto !important; float: none; margin-left: 0; margin-right: 0; } - .column:last-child, .columns:last-child { margin-right: 0; float: none; } - [class*="column"] + [class*="column"]:last-child { float: none; } - [class*="column"]:before { display: table; } - [class*="column"]:after { display: table; clear: both; } - [class^="push_"], [class*="push_"], [class^="pull_"], [class*="pull_"] { margin-left: 0 !important; } } -/*===================================================== - Navigation (with dropdowns) - ======================================================*/ -.navbar { width: 100%; min-height: 60px; display: block; margin-bottom: 20px; background: #4a4d50; position: relative; } -@media only screen and (max-width: 767px) { .navbar { border: none; } - .navbar .column, .navbar .columns { min-height: 0; } } -.navbar.fixed { position: fixed; z-index: 99999; } -.navbar.pinned { position: absolute; } -.navbar a.toggle { display: none; } -@media only screen and (max-width: 767px) { .navbar a.toggle { top: 18%; right: 4%; width: 46px; position: absolute; text-align: center; display: inline-block; color: white; background: #4a4d50; height: 40px; line-height: 38px; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; font-size: 30px; font-size: 1.875rem; } - .navbar a.toggle:hover { background: #565a5d; } - .navbar a.toggle:active, .navbar a.toggle.active { background: #3e4043; } } - -.navbar .logo { display: inline-block; margin: 0 2.12766% 0 0; padding: 0; height: 60px; line-height: 58px; } -.navbar .logo a { display: block; padding: 0; overflow: hidden; height: 60px; line-height: 58px; } -.navbar .logo a img { max-height: 95%; } -@media only screen and (max-width: 767px) { .navbar .logo { float: left; display: inline; } - .navbar .logo a { padding: 0; } - .navbar .logo a img { width: auto; height: auto; max-width: 100%; } } - -.navbar ul { display: table; vertical-align: middle; margin: 0; float: none; } -@media only screen and (max-width: 767px) { .navbar ul { position: absolute; display: block; width: 100% !important; height: 0; max-height: 0; top: 60px; left: 0; overflow: hidden; text-align: center; background: #3e4043; } - .navbar ul.active { height: auto; max-height: 600px; z-index: 999998; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; -webkit-box-shadow: 0 2px 2px #252728; -moz-box-shadow: 0 2px 2px #252728; box-shadow: 0 2px 2px #252728; } } -.navbar ul li { display: table-cell; text-align: center; padding-bottom: 0; margin: 0; height: 60px; line-height: 58px; } -@media only screen and (max-width: 767px) { .navbar ul li { display: block; position: relative; min-height: 50px; max-height: 320px; height: auto; width: 100%; border-right: 0 !important; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; } } -.navbar ul li > a { display: block; padding: 0 16px; white-space: nowrap; color: white; text-shadow: 0 1px 2px #191a1b, 0 1px 0 #191a1b; height: 60px; line-height: 58px; font-size: 16px; font-size: 1rem; } -.navbar ul li > a i.icon-popup { position: absolute; } -.navbar ul li .btn { border-color: #000101 !important; } -.navbar ul li.field { margin-bottom: 0 !important; margin-right: 0; } -@media only screen and (max-width: 767px) { .navbar ul li.field { padding: 0 20px; } } -.navbar ul li.field input.search { background: #191a1b; border: none; color: #f2f2f2; } -.navbar ul li .dropdown { width: auto; min-width: 0; max-width: 320px; height: 0; position: absolute; background: #fafafa; overflow: hidden; z-index: 999; } -@media only screen and (max-width: 767px) { .navbar ul li .dropdown { width: 100%; max-width: 100%; position: relative; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; } - .navbar ul li.active .dropdown { border-bottom: 1px solid #313436; } - .navbar ul li.active .dropdown ul { position: relative; top: 0; background: #36393b; min-height: 50px; max-height: 250px; height: auto; overflow: auto; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; } - .navbar ul li.active .dropdown ul li { min-height: 50px; border-bottom: #3e4043; } - .navbar ul li.active .dropdown ul li a { color: white; border-bottom: 1px solid #313436; } - .navbar ul li.active .dropdown ul li a:hover { color: #d04526; } } - -@media only screen and (min-width: 768px) and (max-width: 939px) { .navbar > ul > li > .btn a { padding: 0 10px 0 10px !important; } - .navbar ul > li .dropdown ul li.active .dropdown { left: -320px; } } - -.navcontain { height: 80px; } -@media only screen and (max-width: 768px) { .navcontain { height: auto; } } - -.pretty.navbar { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7b8085), color-stop(100%, #313436)); background-image: -webkit-linear-gradient(#7b8085, #313436); background-image: -moz-linear-gradient(#7b8085, #313436); background-image: -o-linear-gradient(#7b8085, #313436); background-image: linear-gradient(#7b8085, #313436); -webkit-box-shadow: inset 0 1px 1px #7b8085, 0 1px 2px rgba(0, 0, 0, 0.8) !important; -moz-box-shadow: inset 0 1px 1px #7b8085, 0 1px 2px rgba(0, 0, 0, 0.8) !important; box-shadow: inset 0 1px 1px #7b8085, 0 1px 2px rgba(0, 0, 0, 0.8) !important; /* Remove this line if you dont want a dropshadow on your navigation*/ } -@media only screen and (max-width: 767px) { .pretty.navbar a.toggle { border: 1px solid #3e4043; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7b8085), color-stop(100%, #4a4d50)); background-image: -webkit-linear-gradient(#7b8085, #4a4d50); background-image: -moz-linear-gradient(#7b8085, #4a4d50); background-image: -o-linear-gradient(#7b8085, #4a4d50); background-image: linear-gradient(#7b8085, #4a4d50); -webkit-box-shadow: inset 0 1px 2px #888d91, inset 0 -1px 1px #565a5d, inset 1px 0 1px #565a5d, inset -1px 0 1px #565a5d, 0 1px 1px #63676a; -moz-box-shadow: inset 0 1px 2px #888d91, inset 0 -1px 1px #565a5d, inset 1px 0 1px #565a5d, inset -1px 0 1px #565a5d, 0 1px 1px #63676a; box-shadow: inset 0 1px 2px #888d91, inset 0 -1px 1px #565a5d, inset 1px 0 1px #565a5d, inset -1px 0 1px #565a5d, 0 1px 1px #63676a; } - .pretty.navbar a.toggle i { text-shadow: 0 1px 1px #191a1b; } - .pretty.navbar a.toggle:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #888d91), color-stop(100%, #565a5d)); background-image: -webkit-linear-gradient(#888d91, #565a5d); background-image: -moz-linear-gradient(#888d91, #565a5d); background-image: -o-linear-gradient(#888d91, #565a5d); background-image: linear-gradient(#888d91, #565a5d); } - .pretty.navbar a.toggle:active, .pretty.navbar a.toggle.active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #3e4043), color-stop(100%, #4a4d50)); background-image: -webkit-linear-gradient(#3e4043, #4a4d50); background-image: -moz-linear-gradient(#3e4043, #4a4d50); background-image: -o-linear-gradient(#3e4043, #4a4d50); background-image: linear-gradient(#3e4043, #4a4d50); -webkit-box-shadow: 0 1px 1px #63676a; -moz-box-shadow: 0 1px 1px #63676a; box-shadow: 0 1px 1px #63676a; } } -.pretty.navbar.row { -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; } -@media only screen and (max-width: 767px) { .pretty.navbar.row { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; } } -.pretty.navbar ul li.field input.search { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #191a1b), color-stop(100%, #4f5255)); background-image: -webkit-linear-gradient(#191a1b, #4f5255); background-image: -moz-linear-gradient(#191a1b, #4f5255); background-image: -o-linear-gradient(#191a1b, #4f5255); background-image: linear-gradient(#191a1b, #4f5255); border: none; -webkit-box-shadow: 0 1px 2px #888d91 !important; -moz-box-shadow: 0 1px 2px #888d91 !important; box-shadow: 0 1px 2px #888d91 !important; /* Remove this line if you dont want a dropshadow on your navigation*/ } -.pretty.navbar > ul > li:first-child, .pretty.navbar .pretty.navbar > ul > li:first-child a:hover { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } - -.navbar li .dropdown { width: auto; min-width: 0; max-width: 320px; height: 0; position: absolute; background: #fafafa; overflow: hidden; z-index: 999; } -@media only screen and (max-width: 767px) { .navbar li .dropdown .dropdown { width: 100%; max-width: 100%; position: relative; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; } - .navbar li .dropdown.active .dropdown { border-bottom: 1px solid #313436; } - .navbar li .dropdown.active .dropdown ul { position: relative; top: 0; background: #36393b; min-height: 50px; max-height: 250px; height: auto; overflow: auto; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; } - .navbar li .dropdown.active .dropdown ul li { min-height: 50px; border-bottom: #3e4043; } - .navbar li .dropdown.active .dropdown ul li a { color: white; border-bottom: 1px solid #313436; } - .navbar li .dropdown.active .dropdown ul li a:hover { color: #d04526; } } - -.navbar li .dropdown ul { margin: 0; display: block; } -.navbar li .dropdown ul > li { position: relative; display: block; width: 100%; float: left; text-align: left; height: auto; -webkit-border-radius: none; -moz-border-radius: none; -ms-border-radius: none; -o-border-radius: none; border-radius: none; } -@media only screen and (min-width: 768px) and (max-width: 939px) { .navbar li .dropdown ul > li { max-width: 320px; word-wrap: break-word; } } -.navbar li .dropdown ul > li a { display: block; padding: 0 20px; color: #d04526; border-bottom: 1px solid #cccccc; text-shadow: none; height: 51px; line-height: 49px; } -@media only screen and (max-width: 767px) { .navbar li .dropdown ul > li a { padding: 0 20px; } } -.navbar li .dropdown ul > li .dropdown { display: none; background: white; } -.navbar li .dropdown ul li:first-child a { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; } - -.gumby-no-touch .navbar ul li:hover > a, .gumby-touch .navbar ul li.active > a { position: relative; background: #868d92; z-index: 1000; } - -.gumby-no-touch .navbar ul li:hover .dropdown, .gumby-touch .navbar ul li.active .dropdown { min-height: 50px; max-height: 561px; overflow: visible; height: auto; width: 100%; padding: 0; border-top: 1px solid #3e4043; -webkit-box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.3); box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.3); } - -.gumby-no-touch .navbar ul li:hover .dropdown ul { position: relative; top: 0; min-height: 50px; max-height: 250px; height: auto; -webkit-box-shadow: none !important; -moz-box-shadow: none !important; box-shadow: none !important; -webkit-transition-duration: 0.5s; -moz-transition-duration: 0.5s; -o-transition-duration: 0.5s; transition-duration: 0.5s; } -@media only screen and (max-width: 767px) { .gumby-no-touch .navbar ul li:hover .dropdown ul { overflow: auto; background: #36393b; } - .gumby-no-touch .navbar ul li:hover .dropdown ul li { border-bottom: #3e4043; } - .gumby-no-touch .navbar ul li:hover .dropdown ul li a { color: white; border-bottom: 1px solid #313436; } - .gumby-no-touch .navbar ul li:hover .dropdown ul li a:hover { color: #d04526; } } - -.gumby-no-touch .navbar li .dropdown ul > li:hover .dropdown, .gumby-touch .navbar li .dropdown ul > li.active .dropdown { border-top: none; display: block; position: absolute; z-index: 9999; left: 100%; top: 0; margin-top: 0; } -@media only screen and (max-width: 767px) { .gumby-no-touch .navbar li .dropdown ul > li:hover .dropdown, .gumby-touch .navbar li .dropdown ul > li.active .dropdown { position: relative; left: 0; } - .gumby-no-touch .navbar li .dropdown ul > li:hover .dropdown ul, .gumby-touch .navbar li .dropdown ul > li.active .dropdown ul { background: #252728 !important; } } - -.gumby-no-touch .navbar li .dropdown ul li a:hover { background: #f2f2f2; } - -.gumby-touch .navbar a:hover { color: white !important; } - -.subnav { display: block; width: auto; overflow: hidden; margin: 0 0 18px 0; padding-top: 4px; } -.subnav li, .subnav dt, .subnav dd { float: left; display: inline; margin-left: 9px; margin-bottom: 4px; } -.subnav li:first-child, .subnav dt:first-child, .subnav dd:first-child { margin-left: 0; } -.subnav dt { color: #f2f2f2; font-weight: normal; } -.subnav li a, .subnav dd a { color: white; font-size: 15px; text-decoration: none; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; } -.subnav li.active a, .subnav dd.active a { background: #4a4d50; padding: 5px 9px; text-shadow: 0 1px 1px #4a4d50; } - -/* Buttons */ -.btn, .skiplink { display: inline-block; width: auto; background: #f2f2f2; -webkit-appearance: none; font-family: "Oxygen"; font-weight: 600; padding: 0 !important; text-align: center; } -.btn > a, .btn input, .btn button, .skiplink > a, .skiplink input, .skiplink button { display: block; padding: 0 18px; color: white; height: 100%; } -.btn input, .btn button, .skiplink input, .skiplink button { background: none; border: none; width: 100%; font-size: 100%; cursor: pointer; font-weight: 400; -webkit-appearance: none; -moz-appearance: none; appearance: none; } - -.btn.xlarge, .skiplink.xlarge { font-size: 30px; font-size: 1.875rem; height: 66px; line-height: 64px; } -.btn.xlarge a, .skiplink.xlarge a { position: relative; padding: 0 30px; } -.btn.xlarge.icon-left a, .skiplink.xlarge.icon-left a { padding-left: 66px; } -.btn.xlarge.icon-left a:before, .skiplink.xlarge.icon-left a:before { left: 20px; } -.btn.xlarge.icon-right a, .skiplink.xlarge.icon-right a { padding-right: 66px; } -.btn.xlarge.icon-right a:after, .skiplink.xlarge.icon-right a:after { right: 20px; } -.btn.large, .skiplink.large { font-size: 26px; font-size: 1.625rem; height: 58px; line-height: 56px; } -.btn.large a, .skiplink.large a { position: relative; padding: 0 26px; } -.btn.large.icon-left a, .skiplink.large.icon-left a { padding-left: 58px; } -.btn.large.icon-left a:before, .skiplink.large.icon-left a:before { left: 17.33333px; } -.btn.large.icon-right a, .skiplink.large.icon-right a { padding-right: 58px; } -.btn.large.icon-right a:after, .skiplink.large.icon-right a:after { right: 17.33333px; } -.btn.medium, .skiplink.medium { font-size: 16px; font-size: 1rem; height: 36px; line-height: 34px; } -.btn.medium a, .skiplink.medium a { position: relative; padding: 0 16px; } -.btn.medium.icon-left a, .skiplink.medium.icon-left a { padding-left: 36px; } -.btn.medium.icon-left a:before, .skiplink.medium.icon-left a:before { left: 10.66667px; } -.btn.medium.icon-right a, .skiplink.medium.icon-right a { padding-right: 36px; } -.btn.medium.icon-right a:after, .skiplink.medium.icon-right a:after { right: 10.66667px; } -.btn.medium a, .skiplink.medium a { padding: 0 18px; } -.btn.small, .skiplink.small { font-size: 10px; font-size: 0.625rem; height: 23px; line-height: 21px; } -.btn.small a, .skiplink.small a { position: relative; padding: 0 10px; } -.btn.small.icon-left a, .skiplink.small.icon-left a { padding-left: 23px; } -.btn.small.icon-left a:before, .skiplink.small.icon-left a:before { left: 6.66667px; } -.btn.small.icon-right a, .skiplink.small.icon-right a { padding-right: 23px; } -.btn.small.icon-right a:after, .skiplink.small.icon-right a:after { right: 6.66667px; } -.btn.small a, .skiplink.small a { padding: 0 10px; } -.btn.oval, .skiplink.oval { -webkit-border-radius: 1000px; -moz-border-radius: 1000px; -ms-border-radius: 1000px; -o-border-radius: 1000px; border-radius: 1000px; } -.btn.pill-left, .skiplink.pill-left { -webkit-border-radius: 500px 0 0 500px; -moz-border-radius: 500px 0 0 500px; -ms-border-radius: 500px 0 0 500px; -o-border-radius: 500px 0 0 500px; border-radius: 500px 0 0 500px; } -.btn.pill-right, .skiplink.pill-right { -webkit-border-radius: 0 500px 500px 0; -moz-border-radius: 0 500px 500px 0; -ms-border-radius: 0 500px 500px 0; -o-border-radius: 0 500px 500px 0; border-radius: 0 500px 500px 0; } - -.btn.primary, .skiplink.primary { background: #3085d6; border: 1px solid #3085d6; } -.btn.primary:hover, .skiplink.primary:hover { background: #5b9ede; } -.btn.primary:active, .skiplink.primary:active { background: #236bb0; } -.btn.secondary, .skiplink.secondary { background: #42a35a; border: 1px solid #42a35a; } -.btn.secondary:hover, .skiplink.secondary:hover { background: #5bbd73; } -.btn.secondary:active, .skiplink.secondary:active { background: #337f46; } -.btn.default, .skiplink.default { background: #f2f2f2; border: 1px solid #f2f2f2; color: #555555; border: 1px solid #f2f2f2; } -.btn.default:hover, .skiplink.default:hover { background: white; } -.btn.default:active, .skiplink.default:active { background: #d8d8d8; } -.btn.default:hover, .skiplink.default:hover { border: 1px solid #e5e5e5; } -.btn.default a, .btn.default input, .btn.default button, .skiplink.default a, .skiplink.default input, .skiplink.default button { color: #555555; } -.btn.info, .skiplink.info { background: #4a4d50; border: 1px solid #4a4d50; } -.btn.info:hover, .skiplink.info:hover { background: #63676a; } -.btn.info:active, .skiplink.info:active { background: #313436; } -.btn.danger, .skiplink.danger { background: #ca3838; border: 1px solid #ca3838; } -.btn.danger:hover, .skiplink.danger:hover { background: #d56060; } -.btn.danger:active, .skiplink.danger:active { background: #a32c2c; } -.btn.warning, .skiplink.warning { background: #f6b83f; border: 1px solid #f6b83f; color: #644405; } -.btn.warning:hover, .skiplink.warning:hover { background: #f8ca70; } -.btn.warning:active, .skiplink.warning:active { background: #f4a60e; } -.btn.warning a, .btn.warning input, .btn.warning button, .skiplink.warning a, .skiplink.warning input, .skiplink.warning button { color: #644405; } -.btn.success, .skiplink.success { background: #58c026; border: 1px solid #58c026; } -.btn.success:hover, .skiplink.success:hover { background: #72d940; } -.btn.success:active, .skiplink.success:active { background: #44951e; } -.btn.metro, .metro .btn, .metro .skiplink, .btn.metro:hover, .metro .btn:hover, .metro .skiplink:hover, .skiplink.metro:hover, .btn.metro:active, .metro .btn:active, .metro .skiplink:active, .skiplink.metro:active, .skiplink.metro { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; } -.btn.metro.rounded, .metro .rounded.btn, .metro .rounded.skiplink, .rounded.skiplink.metro:hover, .rounded.skiplink.metro:active, .skiplink.metro.rounded { -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; } -.btn.pretty, .pretty .btn, .pretty .skiplink, .btn.pretty:hover, .pretty .btn:hover, .pretty .skiplink:hover, .skiplink.pretty:hover, .btn.pretty:active, .pretty .btn:active, .pretty .skiplink:active, .skiplink.pretty:active, .skiplink.pretty { -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; } -.btn.pretty.squared, .pretty .squared.btn, .pretty .squared.skiplink, .squared.skiplink.pretty:hover, .squared.skiplink.pretty:active, .skiplink.pretty.squared { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; } - -.btn.pretty.primary, .pretty .primary.btn, .pretty .primary.skiplink, .primary.skiplink.pretty:hover, .primary.skiplink.pretty:active, .skiplink.pretty.primary { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #85b7e7), color-stop(100%, #2a85dc)); background-image: -webkit-linear-gradient(#85b7e7, #2a85dc); background-image: -moz-linear-gradient(#85b7e7, #2a85dc); background-image: -o-linear-gradient(#85b7e7, #2a85dc); background-image: linear-gradient(#85b7e7, #2a85dc); -webkit-box-shadow: inset 0 0 3px #f0f6fc; -moz-box-shadow: inset 0 0 3px #f0f6fc; box-shadow: inset 0 0 3px #f0f6fc; border: 1px solid #1f5e9b; } -.pretty .primary.btn:hover, .pretty .primary.skiplink:hover, .primary.btn.pretty:hover, .primary.skiplink.pretty:hover, .skiplink.pretty.primary:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a2d4fc), color-stop(100%, #54b2fe)); background-image: -webkit-linear-gradient(#a2d4fc, #54b2fe); background-image: -moz-linear-gradient(#a2d4fc, #54b2fe); background-image: -o-linear-gradient(#a2d4fc, #54b2fe); background-image: linear-gradient(#a2d4fc, #54b2fe); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #0e90f8; } -.pretty .primary.btn:active, .pretty .primary.skiplink:active, .primary.btn.pretty:active, .primary.skiplink.pretty:active, .skiplink.pretty.primary:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2a85dc), color-stop(100%, #85b7e7)); background-image: -webkit-linear-gradient(#2a85dc, #85b7e7); background-image: -moz-linear-gradient(#2a85dc, #85b7e7); background-image: -o-linear-gradient(#2a85dc, #85b7e7); background-image: linear-gradient(#2a85dc, #85b7e7); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; } -.btn.pretty.primary a, .pretty .primary.btn a, .pretty .primary.skiplink a, .primary.skiplink.pretty:hover a, .primary.skiplink.pretty:active a, .btn.pretty.primary input, .pretty .primary.btn input, .pretty .primary.skiplink input, .primary.skiplink.pretty:hover input, .primary.skiplink.pretty:active input, .btn.pretty.primary button, .pretty .primary.btn button, .pretty .primary.skiplink button, .primary.skiplink.pretty:hover button, .primary.skiplink.pretty:active button, .skiplink.pretty.primary a, .skiplink.pretty.primary input, .skiplink.pretty.primary button { text-shadow: 0 1px 1px #1a5186; } -.btn.pretty.secondary, .pretty .secondary.btn, .pretty .secondary.skiplink, .secondary.skiplink.pretty:hover, .secondary.skiplink.pretty:active, .skiplink.pretty.secondary { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #80cb92), color-stop(100%, #3ca957)); background-image: -webkit-linear-gradient(#80cb92, #3ca957); background-image: -moz-linear-gradient(#80cb92, #3ca957); background-image: -o-linear-gradient(#80cb92, #3ca957); background-image: linear-gradient(#80cb92, #3ca957); -webkit-box-shadow: inset 0 0 3px #daf0e0; -moz-box-shadow: inset 0 0 3px #daf0e0; box-shadow: inset 0 0 3px #daf0e0; border: 1px solid #2c6d3c; } -.pretty .secondary.btn:hover, .pretty .secondary.skiplink:hover, .secondary.btn.pretty:hover, .secondary.skiplink.pretty:hover, .skiplink.pretty.secondary:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a1d3ad), color-stop(100%, #68c07d)); background-image: -webkit-linear-gradient(#a1d3ad, #68c07d); background-image: -moz-linear-gradient(#a1d3ad, #68c07d); background-image: -o-linear-gradient(#a1d3ad, #68c07d); background-image: linear-gradient(#a1d3ad, #68c07d); -webkit-box-shadow: inset 0 0 3px #f8fcf9; -moz-box-shadow: inset 0 0 3px #f8fcf9; box-shadow: inset 0 0 3px #f8fcf9; border: 1px solid #469659; } -.pretty .secondary.btn:active, .pretty .secondary.skiplink:active, .secondary.btn.pretty:active, .secondary.skiplink.pretty:active, .skiplink.pretty.secondary:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #3ca957), color-stop(100%, #80cb92)); background-image: -webkit-linear-gradient(#3ca957, #80cb92); background-image: -moz-linear-gradient(#3ca957, #80cb92); background-image: -o-linear-gradient(#3ca957, #80cb92); background-image: linear-gradient(#3ca957, #80cb92); -webkit-box-shadow: inset 0 0 3px #ecf8ef; -moz-box-shadow: inset 0 0 3px #ecf8ef; box-shadow: inset 0 0 3px #ecf8ef; } -.btn.pretty.secondary a, .pretty .secondary.btn a, .pretty .secondary.skiplink a, .secondary.skiplink.pretty:hover a, .secondary.skiplink.pretty:active a, .btn.pretty.secondary input, .pretty .secondary.btn input, .pretty .secondary.skiplink input, .secondary.skiplink.pretty:hover input, .secondary.skiplink.pretty:active input, .btn.pretty.secondary button, .pretty .secondary.btn button, .pretty .secondary.skiplink button, .secondary.skiplink.pretty:hover button, .secondary.skiplink.pretty:active button, .skiplink.pretty.secondary a, .skiplink.pretty.secondary input, .skiplink.pretty.secondary button { text-shadow: 0 1px 1px #255a32; } -.btn.pretty.default, .pretty .default.btn, .pretty .default.skiplink, .default.skiplink.pretty:hover, .default.skiplink.pretty:active, .skiplink.pretty.default { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #f3f1f1)); background-image: -webkit-linear-gradient(#ffffff, #f3f1f1); background-image: -moz-linear-gradient(#ffffff, #f3f1f1); background-image: -o-linear-gradient(#ffffff, #f3f1f1); background-image: linear-gradient(#ffffff, #f3f1f1); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #cccccc; } -.pretty .default.btn:hover, .pretty .default.skiplink:hover, .default.btn.pretty:hover, .default.skiplink.pretty:hover, .skiplink.pretty.default:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #ffffff)); background-image: -webkit-linear-gradient(#ffffff, #ffffff); background-image: -moz-linear-gradient(#ffffff, #ffffff); background-image: -o-linear-gradient(#ffffff, #ffffff); background-image: linear-gradient(#ffffff, #ffffff); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #d9d9d9; } -.pretty .default.btn:active, .pretty .default.skiplink:active, .default.btn.pretty:active, .default.skiplink.pretty:active, .skiplink.pretty.default:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f3f1f1), color-stop(100%, #ffffff)); background-image: -webkit-linear-gradient(#f3f1f1, #ffffff); background-image: -moz-linear-gradient(#f3f1f1, #ffffff); background-image: -o-linear-gradient(#f3f1f1, #ffffff); background-image: linear-gradient(#f3f1f1, #ffffff); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; } -.btn.pretty.default a, .pretty .default.btn a, .pretty .default.skiplink a, .default.skiplink.pretty:hover a, .default.skiplink.pretty:active a, .btn.pretty.default input, .pretty .default.btn input, .pretty .default.skiplink input, .default.skiplink.pretty:hover input, .default.skiplink.pretty:active input, .btn.pretty.default button, .pretty .default.btn button, .pretty .default.skiplink button, .default.skiplink.pretty:hover button, .default.skiplink.pretty:active button, .skiplink.pretty.default a, .skiplink.pretty.default input, .skiplink.pretty.default button { text-shadow: 0 1px 1px white; } -.btn.pretty.info, .pretty .info.btn, .pretty .info.skiplink, .info.skiplink.pretty:hover, .info.skiplink.pretty:active, .skiplink.pretty.info { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7b8085), color-stop(100%, #464d54)); background-image: -webkit-linear-gradient(#7b8085, #464d54); background-image: -moz-linear-gradient(#7b8085, #464d54); background-image: -o-linear-gradient(#7b8085, #464d54); background-image: linear-gradient(#7b8085, #464d54); -webkit-box-shadow: inset 0 0 3px #bdc0c2; -moz-box-shadow: inset 0 0 3px #bdc0c2; box-shadow: inset 0 0 3px #bdc0c2; border: 1px solid #252728; } -.pretty .info.btn:hover, .pretty .info.skiplink:hover, .info.btn.pretty:hover, .info.skiplink.pretty:hover, .skiplink.pretty.info:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #aeb3b6), color-stop(100%, #808e98)); background-image: -webkit-linear-gradient(#aeb3b6, #808e98); background-image: -moz-linear-gradient(#aeb3b6, #808e98); background-image: -o-linear-gradient(#aeb3b6, #808e98); background-image: linear-gradient(#aeb3b6, #808e98); -webkit-box-shadow: inset 0 0 3px #f1f2f3; -moz-box-shadow: inset 0 0 3px #f1f2f3; box-shadow: inset 0 0 3px #f1f2f3; border: 1px solid #60676b; } -.pretty .info.btn:active, .pretty .info.skiplink:active, .info.btn.pretty:active, .info.skiplink.pretty:active, .skiplink.pretty.info:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #464d54), color-stop(100%, #7b8085)); background-image: -webkit-linear-gradient(#464d54, #7b8085); background-image: -moz-linear-gradient(#464d54, #7b8085); background-image: -o-linear-gradient(#464d54, #7b8085); background-image: linear-gradient(#464d54, #7b8085); -webkit-box-shadow: inset 0 0 3px #cbcdce; -moz-box-shadow: inset 0 0 3px #cbcdce; box-shadow: inset 0 0 3px #cbcdce; } -.btn.pretty.info a, .pretty .info.btn a, .pretty .info.skiplink a, .info.skiplink.pretty:hover a, .info.skiplink.pretty:active a, .btn.pretty.info input, .pretty .info.btn input, .pretty .info.skiplink input, .info.skiplink.pretty:hover input, .info.skiplink.pretty:active input, .btn.pretty.info button, .pretty .info.btn button, .pretty .info.skiplink button, .info.skiplink.pretty:hover button, .info.skiplink.pretty:active button, .skiplink.pretty.info a, .skiplink.pretty.info input, .skiplink.pretty.info button { text-shadow: 0 1px 1px #191a1b; } -.btn.pretty.danger, .pretty .danger.btn, .pretty .danger.skiplink, .danger.skiplink.pretty:hover, .danger.skiplink.pretty:active, .skiplink.pretty.danger { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #df8989), color-stop(100%, #d03232)); background-image: -webkit-linear-gradient(#df8989, #d03232); background-image: -moz-linear-gradient(#df8989, #d03232); background-image: -o-linear-gradient(#df8989, #d03232); background-image: linear-gradient(#df8989, #d03232); -webkit-box-shadow: inset 0 0 3px #faeded; -moz-box-shadow: inset 0 0 3px #faeded; box-shadow: inset 0 0 3px #faeded; border: 1px solid #8f2626; } -.pretty .danger.btn:hover, .pretty .danger.skiplink:hover, .danger.btn.pretty:hover, .danger.skiplink.pretty:hover, .skiplink.pretty.danger:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #f79696), color-stop(100%, #f64a4a)); background-image: -webkit-linear-gradient(#f79696, #f64a4a); background-image: -moz-linear-gradient(#f79696, #f64a4a); background-image: -o-linear-gradient(#f79696, #f64a4a); background-image: linear-gradient(#f79696, #f64a4a); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #e21212; } -.pretty .danger.btn:active, .pretty .danger.skiplink:active, .danger.btn.pretty:active, .danger.skiplink.pretty:active, .skiplink.pretty.danger:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d03232), color-stop(100%, #df8989)); background-image: -webkit-linear-gradient(#d03232, #df8989); background-image: -moz-linear-gradient(#d03232, #df8989); background-image: -o-linear-gradient(#d03232, #df8989); background-image: linear-gradient(#d03232, #df8989); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; } -.btn.pretty.danger a, .pretty .danger.btn a, .pretty .danger.skiplink a, .danger.skiplink.pretty:hover a, .danger.skiplink.pretty:active a, .btn.pretty.danger input, .pretty .danger.btn input, .pretty .danger.skiplink input, .danger.skiplink.pretty:hover input, .danger.skiplink.pretty:active input, .btn.pretty.danger button, .pretty .danger.btn button, .pretty .danger.skiplink button, .danger.skiplink.pretty:hover button, .danger.skiplink.pretty:active button, .skiplink.pretty.danger a, .skiplink.pretty.danger input, .skiplink.pretty.danger button { text-shadow: 0 1px 1px #7b2121; } -.btn.pretty.warning, .pretty .warning.btn, .pretty .warning.skiplink, .warning.skiplink.pretty:hover, .warning.skiplink.pretty:active, .skiplink.pretty.warning { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fbdca0), color-stop(100%, #fbba3a)); background-image: -webkit-linear-gradient(#fbdca0, #fbba3a); background-image: -moz-linear-gradient(#fbdca0, #fbba3a); background-image: -o-linear-gradient(#fbdca0, #fbba3a); background-image: linear-gradient(#fbdca0, #fbba3a); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #de960a; color: #644405; } -.pretty .warning.btn:hover, .pretty .warning.skiplink:hover, .warning.btn.pretty:hover, .warning.skiplink.pretty:hover, .skiplink.pretty.warning:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #feecca), color-stop(100%, #ffd37d)); background-image: -webkit-linear-gradient(#feecca, #ffd37d); background-image: -moz-linear-gradient(#feecca, #ffd37d); background-image: -o-linear-gradient(#feecca, #ffd37d); background-image: linear-gradient(#feecca, #ffd37d); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; border: 1px solid #fcb834; } -.pretty .warning.btn:active, .pretty .warning.skiplink:active, .warning.btn.pretty:active, .warning.skiplink.pretty:active, .skiplink.pretty.warning:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fbba3a), color-stop(100%, #fbdca0)); background-image: -webkit-linear-gradient(#fbba3a, #fbdca0); background-image: -moz-linear-gradient(#fbba3a, #fbdca0); background-image: -o-linear-gradient(#fbba3a, #fbdca0); background-image: linear-gradient(#fbba3a, #fbdca0); -webkit-box-shadow: inset 0 0 3px white; -moz-box-shadow: inset 0 0 3px white; box-shadow: inset 0 0 3px white; } -.btn.pretty.warning a, .pretty .warning.btn a, .pretty .warning.skiplink a, .warning.skiplink.pretty:hover a, .warning.skiplink.pretty:active a, .btn.pretty.warning input, .pretty .warning.btn input, .pretty .warning.skiplink input, .warning.skiplink.pretty:hover input, .warning.skiplink.pretty:active input, .btn.pretty.warning button, .pretty .warning.btn button, .pretty .warning.skiplink button, .warning.skiplink.pretty:hover button, .warning.skiplink.pretty:active button, .skiplink.pretty.warning a, .skiplink.pretty.warning input, .skiplink.pretty.warning button { text-shadow: 0 1px 1px #fbdca0; } -.btn.pretty.success, .pretty .success.btn, .pretty .success.skiplink, .success.skiplink.pretty:hover, .success.skiplink.pretty:active, .skiplink.pretty.success { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #91e26a), color-stop(100%, #56c620)); background-image: -webkit-linear-gradient(#91e26a, #56c620); background-image: -moz-linear-gradient(#91e26a, #56c620); background-image: -o-linear-gradient(#91e26a, #56c620); background-image: linear-gradient(#91e26a, #56c620); -webkit-box-shadow: inset 0 0 3px #e0f7d5; -moz-box-shadow: inset 0 0 3px #e0f7d5; box-shadow: inset 0 0 3px #e0f7d5; border: 1px solid #3b8019; } -.pretty .success.btn:hover, .pretty .success.skiplink:hover, .success.btn.pretty:hover, .success.skiplink.pretty:hover, .skiplink.pretty.success:hover { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #96e570), color-stop(100%, #64df29)); background-image: -webkit-linear-gradient(#96e570, #64df29); background-image: -moz-linear-gradient(#96e570, #64df29); background-image: -o-linear-gradient(#96e570, #64df29); background-image: linear-gradient(#96e570, #64df29); -webkit-box-shadow: inset 0 0 3px #e5f9db; -moz-box-shadow: inset 0 0 3px #e5f9db; box-shadow: inset 0 0 3px #e5f9db; border: 1px solid #479f1d; } -.pretty .success.btn:active, .pretty .success.skiplink:active, .success.btn.pretty:active, .success.skiplink.pretty:active, .skiplink.pretty.success:active { background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #56c620), color-stop(100%, #91e26a)); background-image: -webkit-linear-gradient(#56c620, #91e26a); background-image: -moz-linear-gradient(#56c620, #91e26a); background-image: -o-linear-gradient(#56c620, #91e26a); background-image: linear-gradient(#56c620, #91e26a); -webkit-box-shadow: inset 0 0 3px #f0fbea; -moz-box-shadow: inset 0 0 3px #f0fbea; box-shadow: inset 0 0 3px #f0fbea; } -.btn.pretty.success a, .pretty .success.btn a, .pretty .success.skiplink a, .success.skiplink.pretty:hover a, .success.skiplink.pretty:active a, .btn.pretty.success input, .pretty .success.btn input, .pretty .success.skiplink input, .success.skiplink.pretty:hover input, .success.skiplink.pretty:active input, .btn.pretty.success button, .pretty .success.btn button, .pretty .success.skiplink button, .success.skiplink.pretty:hover button, .success.skiplink.pretty:active button, .skiplink.pretty.success a, .skiplink.pretty.success input, .skiplink.pretty.success button { text-shadow: 0 1px 1px #316b15; } - -/* Icons */ -[class^="icon-"] a:before, [class*=" icon-"] a:before, [class^="icon-"] a:after, [class*=" icon-"] a:after, i[class^="icon-"], i[class*=" icon-"] { font-family: "entypo"; position: absolute; text-decoration: none; zoom: 1; } - -i[class^="icon-"], i[class*=" icon-"] { display: inline-block; position: static; min-width: 20px; margin: 0 5px; text-align: center; } - -/* Form Styles */ -form { margin: 0 0 18px; } -form label { display: block; font-size: 16px; font-size: 1rem; line-height: 1.625em; cursor: pointer; margin-bottom: 9px; } -form label.inline { display: inline-block; padding-right: 20px; } -form dt { margin: 0; } -form textarea { height: 150px; } -form ul, form ul li { margin-left: 0; list-style-type: none; } -form fieldset { border-style: solid; border-width: 0.0625em; padding: 1.5625em; border-color: #d8d8d8; margin: 18px 0; } -form fieldset legend { padding: 5px 10px; } - -.field { position: relative; max-width: 100%; margin-bottom: 10px; vertical-align: middle; font-size: 16px; overflow: hidden; /* remove inline-block white-space — A 0px font-size = 0px of white space */ } -.field.metro, .field .metro { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; } -.field input, .field input[type="*"], .field textarea { max-width: 100%; width: 100%; padding: 0; margin: 0; border: none; outline: none; resize: none; -webkit-appearance: none; font-family: "Oxygen"; font-weight: 300; font-size: 16px; font-size: 1rem; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } -.field .input { position: relative; padding: 0 10px; background: #fff; border: 1px solid #d8d8d8; height: 36px; line-height: 34px; font-size: 16px; font-size: 1rem; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; } -.field .input.search { height: 36px; line-height: 34px; -webkit-border-radius: 1000px; -moz-border-radius: 1000px; -ms-border-radius: 1000px; -o-border-radius: 1000px; border-radius: 1000px; padding-right: 0; } -.field .input.textarea { height: auto; } -.field .xnarrow { width: 13.33333%; } -.field .narrow { width: 30.66667%; } -.field .normal { width: 48%; } -.field .wide { width: 65.33333%; } -.field .xwide { width: 82.66667%; } -.field .xxwide { width: 100%; } -.field .xnarrow, .field .narrow, .field .normal, .field .wide, .field .xwide, .field .xxwide { margin: 0; } -.field .xnarrow:last-child, .field .narrow:last-child, .field .normal:last-child, .field .wide:last-child, .field .xwide:last-child, .field .xxwide:last-child { margin-left: -4px; } -.field .xnarrow:first-child, .field .narrow:first-child, .field .normal:first-child, .field .wide:first-child, .field .xwide:first-child, .field .xxwide:first-child { margin-right: 3.94%; margin-left: 0; } -.field .xnarrow:first-child:last-child, .field .narrow:first-child:last-child, .field .normal:first-child:last-child, .field .wide:first-child:last-child, .field .xwide:first-child:last-child, .field .xxwide:first-child:last-child { margin: 0; } -.field label + .xnarrow:last-child, .field label + .narrow:last-child, .field label + .normal:last-child, .field label + .wide:last-child, .field label + .xwide:last-child, .field label + .xxwide:last-child { margin-left: 0; } -@media only screen and (max-width: 960px) { .field .xxwide:first-child, .field .xxwide:last-child { margin-right: 0%; } } -.field.prepend, .field.append { font-size: 0; white-space: nowrap; padding-bottom: 3.5px; } -.field.prepend input, .field.prepend .input, .field.append input, .field.append .input { display: inline-block; max-width: 100%; } -.field.prepend input, .field.prepend .input { -webkit-border-radius: 0px 4px 4px 0; -moz-border-radius: 0px 4px 4px 0; -ms-border-radius: 0px 4px 4px 0; -o-border-radius: 0px 4px 4px 0; border-radius: 0px 4px 4px 0; } -.field.append input, .field.append .input { -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; -ms-border-radius: 4px 0 0 4px; -o-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.field.prepend.append input { -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; } -.field.prepend.append input:first-child { -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; -ms-border-radius: 4px 0 0 4px; -o-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.field.prepend.append input:last-child { margin-left: -1px; -webkit-border-radius: 0px 4px 4px 0; -moz-border-radius: 0px 4px 4px 0; -ms-border-radius: 0px 4px 4px 0; -o-border-radius: 0px 4px 4px 0; border-radius: 0px 4px 4px 0; } -.field.prepend .adjoined, .field.append .adjoined, .field.prepend .btn, .field.append .btn { position: relative; display: inline-block; margin-bottom: 0; z-index: 99; } -.field.prepend .btn a, .field.prepend .btn input, .field.prepend .btn button, .field.append .btn a, .field.append .btn input, .field.append .btn button { padding: 0 12px; } -.field.prepend .adjoined, .field.append .adjoined { padding: 0 10px 0 10px; background: #f2f2f2; border: 1px solid #d8d8d8; font-family: "Oxygen"; font-weight: 600; color: #555555; font-size: 16px; font-size: 1rem; height: 36px; line-height: 34px; } -.field.prepend *:first-child { -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; -ms-border-radius: 4px 0 0 4px; -o-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.field.prepend input:first-child { margin-right: 0; } -.field.prepend .adjoined, .field.prepend .btn { margin-right: -1px; } -.field .adjoined:first-child { margin-left: 0 !important; } -.field.append .adjoined, .field.append .btn { margin-left: -1px; } -.field.append *:last-child { -webkit-border-radius: 0px 4px 4px 0; -moz-border-radius: 0px 4px 4px 0; -ms-border-radius: 0px 4px 4px 0; -o-border-radius: 0px 4px 4px 0; border-radius: 0px 4px 4px 0; } -.field.append button, .field.prepend button { display: inline-block; } -.field.append input:first-child { margin-right: 0; } -.field.double input, .field.double .input { width: 50% !important; } -.field.double input:last-child, .field.double .input:last-child { margin-left: -1px; } -.field.danger:after { font-family: "entypo"; content: "\2716"; font-size: 16px; position: absolute; top: 14%; right: 15px; z-index: 999; color: #ca3838; } -.field.danger.no-icon:after { display: none; } -.field.danger.append:after, .field.danger.prepend:after { content: ""; } -.field.danger input, .field.danger .input, .field.danger textarea, .field.danger .textarea, .field.danger .radio span, .field.danger .checkbox span, .field.danger .picker { border-color: #ca3838; color: #ca3838; background: #f0c5c5; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; } -.field.danger textarea { color: #ca3838; } -.field.danger input::-webkit-input-placeholder, .field.danger textarea::-webkit-input-placeholder { color: #ca3838; } -.field.danger input:-moz-placeholder, .field.danger textarea:-moz-placeholder { color: #ca3838; } -.field.warning:after { font-family: "entypo"; content: "\26a0"; font-size: 16px; position: absolute; top: 14%; right: 15px; z-index: 999; color: #f6b83f; } -.field.warning.no-icon:after { display: none; } -.field.warning.append:after, .field.warning.prepend:after { content: ""; } -.field.warning input, .field.warning .input, .field.warning textarea, .field.warning .textarea, .field.warning .radio span, .field.warning .checkbox span, .field.warning .picker { border-color: #f6b83f; color: #f6b83f; background: #fef7ea; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; } -.field.warning textarea { color: #f6b83f; } -.field.warning input::-webkit-input-placeholder, .field.warning textarea::-webkit-input-placeholder { color: #f6b83f; } -.field.warning input:-moz-placeholder, .field.warning textarea:-moz-placeholder { color: #f6b83f; } -.field.success:after { font-family: "entypo"; content: "\2713"; font-size: 16px; position: absolute; top: 14%; right: 15px; z-index: 999; color: #58c026; } -.field.success.no-icon:after { display: none; } -.field.success.append:after, .field.success.prepend:after { content: ""; } -.field.success input, .field.success .input, .field.success textarea, .field.success .textarea, .field.success .radio span, .field.success .checkbox span, .field.success .picker { border-color: #58c026; color: #58c026; background: #c0eeaa; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; } -.field.success textarea { color: #58c026; } -.field.success input::-webkit-input-placeholder, .field.success textarea::-webkit-input-placeholder { color: #58c026; } -.field.success input:-moz-placeholder, .field.success textarea:-moz-placeholder { color: #58c026; } -.field .picker.danger { border-color: #ca3838; color: #ca3838; background: #f0c5c5; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; } -.field .picker.danger select, .field .picker.danger:after { color: #ca3838; } -.field .picker.warning { border-color: #f6b83f; color: #f6b83f; background: #fef7ea; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; } -.field .picker.warning select, .field .picker.warning:after { color: #f6b83f; } -.field .picker.success { border-color: #58c026; color: #58c026; background: #c0eeaa; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; } -.field .picker.success select, .field .picker.success:after { color: #58c026; } - -.field .text input[type="search"] { -webkit-appearance: textfield; } - -.no-js .radio input { -webkit-appearance: radio; margin-left: 1px; } -.no-js .checkbox input { -webkit-appearance: checkbox; } -.no-js .radio input, .no-js .checkbox input { display: inline-block; width: 16px; } - -.js .field .radio, .js .field .checkbox { position: relative; } -.js .field .radio.danger, .js .field .checkbox.danger { color: #ca3838; } -.js .field .radio.danger span, .js .field .checkbox.danger span { border-color: #ca3838; color: #ca3838; background: #f0c5c5; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; } -.js .field .radio.warning, .js .field .checkbox.warning { color: #f6b83f; } -.js .field .radio.warning span, .js .field .checkbox.warning span { border-color: #f6b83f; color: #f6b83f; background: #fef7ea; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; } -.js .field .radio.success, .js .field .checkbox.success { color: #58c026; color: #555555; } -.js .field .radio.success i, .js .field .checkbox.success i { color: #58c026; } -.js .field .radio.success span, .js .field .checkbox.success span { border-color: #58c026; color: #58c026; background: #c0eeaa; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; transition-duration: 0.2s; } -.js .field .radio.checked i, .js .field .checkbox.checked i { position: absolute; top: -1px; left: -8px; line-height: 16px; } -.js .field .radio span, .js .field .checkbox span { display: inline-block; width: 16px; height: 16px; position: relative; top: 2px; border: solid 1px #ccc; background: #fefefe; } -.js .field .radio input[type="radio"], .js .field .radio input[type="checkbox"], .js .field .checkbox input[type="radio"], .js .field .checkbox input[type="checkbox"] { display: none; } -.js .field .radio span { -webkit-border-radius: 8px; -moz-border-radius: 8px; -ms-border-radius: 8px; -o-border-radius: 8px; border-radius: 8px; } -.js .field .checkbox span { -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; } - -.field .text input[type="search"] { -webkit-appearance: textfield; } - -/* Form Picker Element ("; - - // Support: IE8, Opera 11-12.16 - // Nothing should be selected when empty strings follow ^= or $= or *= - // The test attribute must be unknown in Opera but "safe" for WinRT - // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section - if ( div.querySelectorAll("[msallowclip^='']").length ) { - rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); - } - - // Support: IE8 - // Boolean attributes and "value" are not treated correctly - if ( !div.querySelectorAll("[selected]").length ) { - rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); - } - - // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":checked").length ) { - rbuggyQSA.push(":checked"); - } - }); - - assert(function( div ) { - // Support: Windows 8 Native Apps - // The type and name attributes are restricted during .innerHTML assignment - var input = doc.createElement("input"); - input.setAttribute( "type", "hidden" ); - div.appendChild( input ).setAttribute( "name", "D" ); - - // Support: IE8 - // Enforce case-sensitivity of name attribute - if ( div.querySelectorAll("[name=d]").length ) { - rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); - } - - // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":enabled").length ) { - rbuggyQSA.push( ":enabled", ":disabled" ); - } - - // Opera 10-11 does not throw on post-comma invalid pseudos - div.querySelectorAll("*,:x"); - rbuggyQSA.push(",.*:"); - }); - } - - if ( (support.matchesSelector = rnative.test( (matches = docElem.matches || - docElem.webkitMatchesSelector || - docElem.mozMatchesSelector || - docElem.oMatchesSelector || - docElem.msMatchesSelector) )) ) { - - assert(function( div ) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9) - support.disconnectedMatch = matches.call( div, "div" ); - - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( div, "[s!='']:x" ); - rbuggyMatches.push( "!=", pseudos ); - }); - } - - rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); - rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); - - /* Contains - ---------------------------------------------------------------------- */ - hasCompare = rnative.test( docElem.compareDocumentPosition ); - - // Element contains another - // Purposefully does not implement inclusive descendent - // As in, an element does not contain itself - contains = hasCompare || rnative.test( docElem.contains ) ? - function( a, b ) { - var adown = a.nodeType === 9 ? a.documentElement : a, - bup = b && b.parentNode; - return a === bup || !!( bup && bup.nodeType === 1 && ( - adown.contains ? - adown.contains( bup ) : - a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 - )); - } : - function( a, b ) { - if ( b ) { - while ( (b = b.parentNode) ) { - if ( b === a ) { - return true; - } - } - } - return false; - }; - - /* Sorting - ---------------------------------------------------------------------- */ - - // Document order sorting - sortOrder = hasCompare ? - function( a, b ) { - - // Flag for duplicate removal - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - // Sort on method existence if only one input has compareDocumentPosition - var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; - if ( compare ) { - return compare; - } - - // Calculate position if both inputs belong to the same document - compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? - a.compareDocumentPosition( b ) : - - // Otherwise we know they are disconnected - 1; - - // Disconnected nodes - if ( compare & 1 || - (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { - - // Choose the first element that is related to our preferred document - if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { - return -1; - } - if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { - return 1; - } - - // Maintain original order - return sortInput ? - ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : - 0; - } - - return compare & 4 ? -1 : 1; - } : - function( a, b ) { - // Exit early if the nodes are identical - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - var cur, - i = 0, - aup = a.parentNode, - bup = b.parentNode, - ap = [ a ], - bp = [ b ]; - - // Parentless nodes are either documents or disconnected - if ( !aup || !bup ) { - return a === doc ? -1 : - b === doc ? 1 : - aup ? -1 : - bup ? 1 : - sortInput ? - ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : - 0; - - // If the nodes are siblings, we can do a quick check - } else if ( aup === bup ) { - return siblingCheck( a, b ); - } - - // Otherwise we need full lists of their ancestors for comparison - cur = a; - while ( (cur = cur.parentNode) ) { - ap.unshift( cur ); - } - cur = b; - while ( (cur = cur.parentNode) ) { - bp.unshift( cur ); - } - - // Walk down the tree looking for a discrepancy - while ( ap[i] === bp[i] ) { - i++; - } - - return i ? - // Do a sibling check if the nodes have a common ancestor - siblingCheck( ap[i], bp[i] ) : - - // Otherwise nodes in our document sort first - ap[i] === preferredDoc ? -1 : - bp[i] === preferredDoc ? 1 : - 0; - }; - - return doc; -}; - -Sizzle.matches = function( expr, elements ) { - return Sizzle( expr, null, null, elements ); -}; - -Sizzle.matchesSelector = function( elem, expr ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - // Make sure that attribute selectors are quoted - expr = expr.replace( rattributeQuotes, "='$1']" ); - - if ( support.matchesSelector && documentIsHTML && - ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && - ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { - - try { - var ret = matches.call( elem, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || support.disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9 - elem.document && elem.document.nodeType !== 11 ) { - return ret; - } - } catch(e) {} - } - - return Sizzle( expr, document, null, [ elem ] ).length > 0; -}; - -Sizzle.contains = function( context, elem ) { - // Set document vars if needed - if ( ( context.ownerDocument || context ) !== document ) { - setDocument( context ); - } - return contains( context, elem ); -}; - -Sizzle.attr = function( elem, name ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - var fn = Expr.attrHandle[ name.toLowerCase() ], - // Don't get fooled by Object.prototype properties (jQuery #13807) - val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? - fn( elem, name, !documentIsHTML ) : - undefined; - - return val !== undefined ? - val : - support.attributes || !documentIsHTML ? - elem.getAttribute( name ) : - (val = elem.getAttributeNode(name)) && val.specified ? - val.value : - null; -}; - -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); -}; - -/** - * Document sorting and removing duplicates - * @param {ArrayLike} results - */ -Sizzle.uniqueSort = function( results ) { - var elem, - duplicates = [], - j = 0, - i = 0; - - // Unless we *know* we can detect duplicates, assume their presence - hasDuplicate = !support.detectDuplicates; - sortInput = !support.sortStable && results.slice( 0 ); - results.sort( sortOrder ); - - if ( hasDuplicate ) { - while ( (elem = results[i++]) ) { - if ( elem === results[ i ] ) { - j = duplicates.push( i ); - } - } - while ( j-- ) { - results.splice( duplicates[ j ], 1 ); - } - } - - // Clear input after sorting to release objects - // See https://github.com/jquery/sizzle/pull/225 - sortInput = null; - - return results; -}; - -/** - * Utility function for retrieving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -getText = Sizzle.getText = function( elem ) { - var node, - ret = "", - i = 0, - nodeType = elem.nodeType; - - if ( !nodeType ) { - // If no nodeType, this is expected to be an array - while ( (node = elem[i++]) ) { - // Do not traverse comment nodes - ret += getText( node ); - } - } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { - // Use textContent for elements - // innerText usage removed for consistency of new lines (jQuery #11153) - if ( typeof elem.textContent === "string" ) { - return elem.textContent; - } else { - // Traverse its children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - ret += getText( elem ); - } - } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; - } - // Do not include comment or processing instruction nodes - - return ret; -}; - -Expr = Sizzle.selectors = { - - // Can be adjusted by the user - cacheLength: 50, - - createPseudo: markFunction, - - match: matchExpr, - - attrHandle: {}, - - find: {}, - - relative: { - ">": { dir: "parentNode", first: true }, - " ": { dir: "parentNode" }, - "+": { dir: "previousSibling", first: true }, - "~": { dir: "previousSibling" } - }, - - preFilter: { - "ATTR": function( match ) { - match[1] = match[1].replace( runescape, funescape ); - - // Move the given value to match[3] whether quoted or unquoted - match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape ); - - if ( match[2] === "~=" ) { - match[3] = " " + match[3] + " "; - } - - return match.slice( 0, 4 ); - }, - - "CHILD": function( match ) { - /* matches from matchExpr["CHILD"] - 1 type (only|nth|...) - 2 what (child|of-type) - 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) - 4 xn-component of xn+y argument ([+-]?\d*n|) - 5 sign of xn-component - 6 x of xn-component - 7 sign of y-component - 8 y of y-component - */ - match[1] = match[1].toLowerCase(); - - if ( match[1].slice( 0, 3 ) === "nth" ) { - // nth-* requires argument - if ( !match[3] ) { - Sizzle.error( match[0] ); - } - - // numeric x and y parameters for Expr.filter.CHILD - // remember that false/true cast respectively to 0/1 - match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); - match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); - - // other types prohibit arguments - } else if ( match[3] ) { - Sizzle.error( match[0] ); - } - - return match; - }, - - "PSEUDO": function( match ) { - var excess, - unquoted = !match[6] && match[2]; - - if ( matchExpr["CHILD"].test( match[0] ) ) { - return null; - } - - // Accept quoted arguments as-is - if ( match[3] ) { - match[2] = match[4] || match[5] || ""; - - // Strip excess characters from unquoted arguments - } else if ( unquoted && rpseudo.test( unquoted ) && - // Get excess from tokenize (recursively) - (excess = tokenize( unquoted, true )) && - // advance to the next closing parenthesis - (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { - - // excess is a negative index - match[0] = match[0].slice( 0, excess ); - match[2] = unquoted.slice( 0, excess ); - } - - // Return only captures needed by the pseudo filter method (type and argument) - return match.slice( 0, 3 ); - } - }, - - filter: { - - "TAG": function( nodeNameSelector ) { - var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); - return nodeNameSelector === "*" ? - function() { return true; } : - function( elem ) { - return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; - }; - }, - - "CLASS": function( className ) { - var pattern = classCache[ className + " " ]; - - return pattern || - (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && - classCache( className, function( elem ) { - return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" ); - }); - }, - - "ATTR": function( name, operator, check ) { - return function( elem ) { - var result = Sizzle.attr( elem, name ); - - if ( result == null ) { - return operator === "!="; - } - if ( !operator ) { - return true; - } - - result += ""; - - return operator === "=" ? result === check : - operator === "!=" ? result !== check : - operator === "^=" ? check && result.indexOf( check ) === 0 : - operator === "*=" ? check && result.indexOf( check ) > -1 : - operator === "$=" ? check && result.slice( -check.length ) === check : - operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 : - operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : - false; - }; - }, - - "CHILD": function( type, what, argument, first, last ) { - var simple = type.slice( 0, 3 ) !== "nth", - forward = type.slice( -4 ) !== "last", - ofType = what === "of-type"; - - return first === 1 && last === 0 ? - - // Shortcut for :nth-*(n) - function( elem ) { - return !!elem.parentNode; - } : - - function( elem, context, xml ) { - var cache, outerCache, node, diff, nodeIndex, start, - dir = simple !== forward ? "nextSibling" : "previousSibling", - parent = elem.parentNode, - name = ofType && elem.nodeName.toLowerCase(), - useCache = !xml && !ofType; - - if ( parent ) { - - // :(first|last|only)-(child|of-type) - if ( simple ) { - while ( dir ) { - node = elem; - while ( (node = node[ dir ]) ) { - if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { - return false; - } - } - // Reverse direction for :only-* (if we haven't yet done so) - start = dir = type === "only" && !start && "nextSibling"; - } - return true; - } - - start = [ forward ? parent.firstChild : parent.lastChild ]; - - // non-xml :nth-child(...) stores cache data on `parent` - if ( forward && useCache ) { - // Seek `elem` from a previously-cached index - outerCache = parent[ expando ] || (parent[ expando ] = {}); - cache = outerCache[ type ] || []; - nodeIndex = cache[0] === dirruns && cache[1]; - diff = cache[0] === dirruns && cache[2]; - node = nodeIndex && parent.childNodes[ nodeIndex ]; - - while ( (node = ++nodeIndex && node && node[ dir ] || - - // Fallback to seeking `elem` from the start - (diff = nodeIndex = 0) || start.pop()) ) { - - // When found, cache indexes on `parent` and break - if ( node.nodeType === 1 && ++diff && node === elem ) { - outerCache[ type ] = [ dirruns, nodeIndex, diff ]; - break; - } - } - - // Use previously-cached element index if available - } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { - diff = cache[1]; - - // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) - } else { - // Use the same loop as above to seek `elem` from the start - while ( (node = ++nodeIndex && node && node[ dir ] || - (diff = nodeIndex = 0) || start.pop()) ) { - - if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { - // Cache the index of each encountered element - if ( useCache ) { - (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; - } - - if ( node === elem ) { - break; - } - } - } - } - - // Incorporate the offset, then check against cycle size - diff -= last; - return diff === first || ( diff % first === 0 && diff / first >= 0 ); - } - }; - }, - - "PSEUDO": function( pseudo, argument ) { - // pseudo-class names are case-insensitive - // http://www.w3.org/TR/selectors/#pseudo-classes - // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters - // Remember that setFilters inherits from pseudos - var args, - fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || - Sizzle.error( "unsupported pseudo: " + pseudo ); - - // The user may use createPseudo to indicate that - // arguments are needed to create the filter function - // just as Sizzle does - if ( fn[ expando ] ) { - return fn( argument ); - } - - // But maintain support for old signatures - if ( fn.length > 1 ) { - args = [ pseudo, pseudo, "", argument ]; - return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? - markFunction(function( seed, matches ) { - var idx, - matched = fn( seed, argument ), - i = matched.length; - while ( i-- ) { - idx = indexOf.call( seed, matched[i] ); - seed[ idx ] = !( matches[ idx ] = matched[i] ); - } - }) : - function( elem ) { - return fn( elem, 0, args ); - }; - } - - return fn; - } - }, - - pseudos: { - // Potentially complex pseudos - "not": markFunction(function( selector ) { - // Trim the selector passed to compile - // to avoid treating leading and trailing - // spaces as combinators - var input = [], - results = [], - matcher = compile( selector.replace( rtrim, "$1" ) ); - - return matcher[ expando ] ? - markFunction(function( seed, matches, context, xml ) { - var elem, - unmatched = matcher( seed, null, xml, [] ), - i = seed.length; - - // Match elements unmatched by `matcher` - while ( i-- ) { - if ( (elem = unmatched[i]) ) { - seed[i] = !(matches[i] = elem); - } - } - }) : - function( elem, context, xml ) { - input[0] = elem; - matcher( input, null, xml, results ); - return !results.pop(); - }; - }), - - "has": markFunction(function( selector ) { - return function( elem ) { - return Sizzle( selector, elem ).length > 0; - }; - }), - - "contains": markFunction(function( text ) { - return function( elem ) { - return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; - }; - }), - - // "Whether an element is represented by a :lang() selector - // is based solely on the element's language value - // being equal to the identifier C, - // or beginning with the identifier C immediately followed by "-". - // The matching of C against the element's language value is performed case-insensitively. - // The identifier C does not have to be a valid language name." - // http://www.w3.org/TR/selectors/#lang-pseudo - "lang": markFunction( function( lang ) { - // lang value must be a valid identifier - if ( !ridentifier.test(lang || "") ) { - Sizzle.error( "unsupported lang: " + lang ); - } - lang = lang.replace( runescape, funescape ).toLowerCase(); - return function( elem ) { - var elemLang; - do { - if ( (elemLang = documentIsHTML ? - elem.lang : - elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { - - elemLang = elemLang.toLowerCase(); - return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; - } - } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); - return false; - }; - }), - - // Miscellaneous - "target": function( elem ) { - var hash = window.location && window.location.hash; - return hash && hash.slice( 1 ) === elem.id; - }, - - "root": function( elem ) { - return elem === docElem; - }, - - "focus": function( elem ) { - return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); - }, - - // Boolean properties - "enabled": function( elem ) { - return elem.disabled === false; - }, - - "disabled": function( elem ) { - return elem.disabled === true; - }, - - "checked": function( elem ) { - // In CSS3, :checked should return both checked and selected elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - var nodeName = elem.nodeName.toLowerCase(); - return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); - }, - - "selected": function( elem ) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - // Contents - "empty": function( elem ) { - // http://www.w3.org/TR/selectors/#empty-pseudo - // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), - // but not by others (comment: 8; processing instruction: 7; etc.) - // nodeType < 6 works because attributes (2) do not appear as children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - if ( elem.nodeType < 6 ) { - return false; - } - } - return true; - }, - - "parent": function( elem ) { - return !Expr.pseudos["empty"]( elem ); - }, - - // Element/input types - "header": function( elem ) { - return rheader.test( elem.nodeName ); - }, - - "input": function( elem ) { - return rinputs.test( elem.nodeName ); - }, - - "button": function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === "button" || name === "button"; - }, - - "text": function( elem ) { - var attr; - return elem.nodeName.toLowerCase() === "input" && - elem.type === "text" && - - // Support: IE<8 - // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" - ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); - }, - - // Position-in-collection - "first": createPositionalPseudo(function() { - return [ 0 ]; - }), - - "last": createPositionalPseudo(function( matchIndexes, length ) { - return [ length - 1 ]; - }), - - "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { - return [ argument < 0 ? argument + length : argument ]; - }), - - "even": createPositionalPseudo(function( matchIndexes, length ) { - var i = 0; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "odd": createPositionalPseudo(function( matchIndexes, length ) { - var i = 1; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; --i >= 0; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; ++i < length; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }) - } -}; - -Expr.pseudos["nth"] = Expr.pseudos["eq"]; - -// Add button/input type pseudos -for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { - Expr.pseudos[ i ] = createInputPseudo( i ); -} -for ( i in { submit: true, reset: true } ) { - Expr.pseudos[ i ] = createButtonPseudo( i ); -} - -// Easy API for creating new setFilters -function setFilters() {} -setFilters.prototype = Expr.filters = Expr.pseudos; -Expr.setFilters = new setFilters(); - -tokenize = Sizzle.tokenize = function( selector, parseOnly ) { - var matched, match, tokens, type, - soFar, groups, preFilters, - cached = tokenCache[ selector + " " ]; - - if ( cached ) { - return parseOnly ? 0 : cached.slice( 0 ); - } - - soFar = selector; - groups = []; - preFilters = Expr.preFilter; - - while ( soFar ) { - - // Comma and first run - if ( !matched || (match = rcomma.exec( soFar )) ) { - if ( match ) { - // Don't consume trailing commas as valid - soFar = soFar.slice( match[0].length ) || soFar; - } - groups.push( (tokens = []) ); - } - - matched = false; - - // Combinators - if ( (match = rcombinators.exec( soFar )) ) { - matched = match.shift(); - tokens.push({ - value: matched, - // Cast descendant combinators to space - type: match[0].replace( rtrim, " " ) - }); - soFar = soFar.slice( matched.length ); - } - - // Filters - for ( type in Expr.filter ) { - if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || - (match = preFilters[ type ]( match ))) ) { - matched = match.shift(); - tokens.push({ - value: matched, - type: type, - matches: match - }); - soFar = soFar.slice( matched.length ); - } - } - - if ( !matched ) { - break; - } - } - - // Return the length of the invalid excess - // if we're just parsing - // Otherwise, throw an error or return tokens - return parseOnly ? - soFar.length : - soFar ? - Sizzle.error( selector ) : - // Cache the tokens - tokenCache( selector, groups ).slice( 0 ); -}; - -function toSelector( tokens ) { - var i = 0, - len = tokens.length, - selector = ""; - for ( ; i < len; i++ ) { - selector += tokens[i].value; - } - return selector; -} - -function addCombinator( matcher, combinator, base ) { - var dir = combinator.dir, - checkNonElements = base && dir === "parentNode", - doneName = done++; - - return combinator.first ? - // Check against closest ancestor/preceding element - function( elem, context, xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - return matcher( elem, context, xml ); - } - } - } : - - // Check against all ancestor/preceding elements - function( elem, context, xml ) { - var oldCache, outerCache, - newCache = [ dirruns, doneName ]; - - // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching - if ( xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - if ( matcher( elem, context, xml ) ) { - return true; - } - } - } - } else { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - outerCache = elem[ expando ] || (elem[ expando ] = {}); - if ( (oldCache = outerCache[ dir ]) && - oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { - - // Assign to newCache so results back-propagate to previous elements - return (newCache[ 2 ] = oldCache[ 2 ]); - } else { - // Reuse newcache so results back-propagate to previous elements - outerCache[ dir ] = newCache; - - // A match means we're done; a fail means we have to keep checking - if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { - return true; - } - } - } - } - } - }; -} - -function elementMatcher( matchers ) { - return matchers.length > 1 ? - function( elem, context, xml ) { - var i = matchers.length; - while ( i-- ) { - if ( !matchers[i]( elem, context, xml ) ) { - return false; - } - } - return true; - } : - matchers[0]; -} - -function multipleContexts( selector, contexts, results ) { - var i = 0, - len = contexts.length; - for ( ; i < len; i++ ) { - Sizzle( selector, contexts[i], results ); - } - return results; -} - -function condense( unmatched, map, filter, context, xml ) { - var elem, - newUnmatched = [], - i = 0, - len = unmatched.length, - mapped = map != null; - - for ( ; i < len; i++ ) { - if ( (elem = unmatched[i]) ) { - if ( !filter || filter( elem, context, xml ) ) { - newUnmatched.push( elem ); - if ( mapped ) { - map.push( i ); - } - } - } - } - - return newUnmatched; -} - -function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { - if ( postFilter && !postFilter[ expando ] ) { - postFilter = setMatcher( postFilter ); - } - if ( postFinder && !postFinder[ expando ] ) { - postFinder = setMatcher( postFinder, postSelector ); - } - return markFunction(function( seed, results, context, xml ) { - var temp, i, elem, - preMap = [], - postMap = [], - preexisting = results.length, - - // Get initial elements from seed or context - elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), - - // Prefilter to get matcher input, preserving a map for seed-results synchronization - matcherIn = preFilter && ( seed || !selector ) ? - condense( elems, preMap, preFilter, context, xml ) : - elems, - - matcherOut = matcher ? - // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, - postFinder || ( seed ? preFilter : preexisting || postFilter ) ? - - // ...intermediate processing is necessary - [] : - - // ...otherwise use results directly - results : - matcherIn; - - // Find primary matches - if ( matcher ) { - matcher( matcherIn, matcherOut, context, xml ); - } - - // Apply postFilter - if ( postFilter ) { - temp = condense( matcherOut, postMap ); - postFilter( temp, [], context, xml ); - - // Un-match failing elements by moving them back to matcherIn - i = temp.length; - while ( i-- ) { - if ( (elem = temp[i]) ) { - matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); - } - } - } - - if ( seed ) { - if ( postFinder || preFilter ) { - if ( postFinder ) { - // Get the final matcherOut by condensing this intermediate into postFinder contexts - temp = []; - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) ) { - // Restore matcherIn since elem is not yet a final match - temp.push( (matcherIn[i] = elem) ); - } - } - postFinder( null, (matcherOut = []), temp, xml ); - } - - // Move matched elements from seed to results to keep them synchronized - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) && - (temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) { - - seed[temp] = !(results[temp] = elem); - } - } - } - - // Add elements to results, through postFinder if defined - } else { - matcherOut = condense( - matcherOut === results ? - matcherOut.splice( preexisting, matcherOut.length ) : - matcherOut - ); - if ( postFinder ) { - postFinder( null, results, matcherOut, xml ); - } else { - push.apply( results, matcherOut ); - } - } - }); -} - -function matcherFromTokens( tokens ) { - var checkContext, matcher, j, - len = tokens.length, - leadingRelative = Expr.relative[ tokens[0].type ], - implicitRelative = leadingRelative || Expr.relative[" "], - i = leadingRelative ? 1 : 0, - - // The foundational matcher ensures that elements are reachable from top-level context(s) - matchContext = addCombinator( function( elem ) { - return elem === checkContext; - }, implicitRelative, true ), - matchAnyContext = addCombinator( function( elem ) { - return indexOf.call( checkContext, elem ) > -1; - }, implicitRelative, true ), - matchers = [ function( elem, context, xml ) { - return ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( - (checkContext = context).nodeType ? - matchContext( elem, context, xml ) : - matchAnyContext( elem, context, xml ) ); - } ]; - - for ( ; i < len; i++ ) { - if ( (matcher = Expr.relative[ tokens[i].type ]) ) { - matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; - } else { - matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); - - // Return special upon seeing a positional matcher - if ( matcher[ expando ] ) { - // Find the next relative operator (if any) for proper handling - j = ++i; - for ( ; j < len; j++ ) { - if ( Expr.relative[ tokens[j].type ] ) { - break; - } - } - return setMatcher( - i > 1 && elementMatcher( matchers ), - i > 1 && toSelector( - // If the preceding token was a descendant combinator, insert an implicit any-element `*` - tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) - ).replace( rtrim, "$1" ), - matcher, - i < j && matcherFromTokens( tokens.slice( i, j ) ), - j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), - j < len && toSelector( tokens ) - ); - } - matchers.push( matcher ); - } - } - - return elementMatcher( matchers ); -} - -function matcherFromGroupMatchers( elementMatchers, setMatchers ) { - var bySet = setMatchers.length > 0, - byElement = elementMatchers.length > 0, - superMatcher = function( seed, context, xml, results, outermost ) { - var elem, j, matcher, - matchedCount = 0, - i = "0", - unmatched = seed && [], - setMatched = [], - contextBackup = outermostContext, - // We must always have either seed elements or outermost context - elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), - // Use integer dirruns iff this is the outermost matcher - dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), - len = elems.length; - - if ( outermost ) { - outermostContext = context !== document && context; - } - - // Add elements passing elementMatchers directly to results - // Keep `i` a string if there are no elements so `matchedCount` will be "00" below - // Support: IE<9, Safari - // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id - for ( ; i !== len && (elem = elems[i]) != null; i++ ) { - if ( byElement && elem ) { - j = 0; - while ( (matcher = elementMatchers[j++]) ) { - if ( matcher( elem, context, xml ) ) { - results.push( elem ); - break; - } - } - if ( outermost ) { - dirruns = dirrunsUnique; - } - } - - // Track unmatched elements for set filters - if ( bySet ) { - // They will have gone through all possible matchers - if ( (elem = !matcher && elem) ) { - matchedCount--; - } - - // Lengthen the array for every element, matched or not - if ( seed ) { - unmatched.push( elem ); - } - } - } - - // Apply set filters to unmatched elements - matchedCount += i; - if ( bySet && i !== matchedCount ) { - j = 0; - while ( (matcher = setMatchers[j++]) ) { - matcher( unmatched, setMatched, context, xml ); - } - - if ( seed ) { - // Reintegrate element matches to eliminate the need for sorting - if ( matchedCount > 0 ) { - while ( i-- ) { - if ( !(unmatched[i] || setMatched[i]) ) { - setMatched[i] = pop.call( results ); - } - } - } - - // Discard index placeholder values to get only actual matches - setMatched = condense( setMatched ); - } - - // Add matches to results - push.apply( results, setMatched ); - - // Seedless set matches succeeding multiple successful matchers stipulate sorting - if ( outermost && !seed && setMatched.length > 0 && - ( matchedCount + setMatchers.length ) > 1 ) { - - Sizzle.uniqueSort( results ); - } - } - - // Override manipulation of globals by nested matchers - if ( outermost ) { - dirruns = dirrunsUnique; - outermostContext = contextBackup; - } - - return unmatched; - }; - - return bySet ? - markFunction( superMatcher ) : - superMatcher; -} - -compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { - var i, - setMatchers = [], - elementMatchers = [], - cached = compilerCache[ selector + " " ]; - - if ( !cached ) { - // Generate a function of recursive functions that can be used to check each element - if ( !match ) { - match = tokenize( selector ); - } - i = match.length; - while ( i-- ) { - cached = matcherFromTokens( match[i] ); - if ( cached[ expando ] ) { - setMatchers.push( cached ); - } else { - elementMatchers.push( cached ); - } - } - - // Cache the compiled function - cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); - - // Save selector and tokenization - cached.selector = selector; - } - return cached; -}; - -/** - * A low-level selection function that works with Sizzle's compiled - * selector functions - * @param {String|Function} selector A selector or a pre-compiled - * selector function built with Sizzle.compile - * @param {Element} context - * @param {Array} [results] - * @param {Array} [seed] A set of elements to match against - */ -select = Sizzle.select = function( selector, context, results, seed ) { - var i, tokens, token, type, find, - compiled = typeof selector === "function" && selector, - match = !seed && tokenize( (selector = compiled.selector || selector) ); - - results = results || []; - - // Try to minimize operations if there is no seed and only one group - if ( match.length === 1 ) { - - // Take a shortcut and set the context if the root selector is an ID - tokens = match[0] = match[0].slice( 0 ); - if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && - support.getById && context.nodeType === 9 && documentIsHTML && - Expr.relative[ tokens[1].type ] ) { - - context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; - if ( !context ) { - return results; - - // Precompiled matchers will still verify ancestry, so step up a level - } else if ( compiled ) { - context = context.parentNode; - } - - selector = selector.slice( tokens.shift().value.length ); - } - - // Fetch a seed set for right-to-left matching - i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; - while ( i-- ) { - token = tokens[i]; - - // Abort if we hit a combinator - if ( Expr.relative[ (type = token.type) ] ) { - break; - } - if ( (find = Expr.find[ type ]) ) { - // Search, expanding context for leading sibling combinators - if ( (seed = find( - token.matches[0].replace( runescape, funescape ), - rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context - )) ) { - - // If seed is empty or no tokens remain, we can return early - tokens.splice( i, 1 ); - selector = seed.length && toSelector( tokens ); - if ( !selector ) { - push.apply( results, seed ); - return results; - } - - break; - } - } - } - } - - // Compile and execute a filtering function if one is not provided - // Provide `match` to avoid retokenization if we modified the selector above - ( compiled || compile( selector, match ) )( - seed, - context, - !documentIsHTML, - results, - rsibling.test( selector ) && testContext( context.parentNode ) || context - ); - return results; -}; - -// One-time assignments - -// Sort stability -support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; - -// Support: Chrome<14 -// Always assume duplicates if they aren't passed to the comparison function -support.detectDuplicates = !!hasDuplicate; - -// Initialize against the default document -setDocument(); - -// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) -// Detached nodes confoundingly follow *each other* -support.sortDetached = assert(function( div1 ) { - // Should return 1, but returns 4 (following) - return div1.compareDocumentPosition( document.createElement("div") ) & 1; -}); - -// Support: IE<8 -// Prevent attribute/property "interpolation" -// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx -if ( !assert(function( div ) { - div.innerHTML = ""; - return div.firstChild.getAttribute("href") === "#" ; -}) ) { - addHandle( "type|href|height|width", function( elem, name, isXML ) { - if ( !isXML ) { - return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); - } - }); -} - -// Support: IE<9 -// Use defaultValue in place of getAttribute("value") -if ( !support.attributes || !assert(function( div ) { - div.innerHTML = ""; - div.firstChild.setAttribute( "value", "" ); - return div.firstChild.getAttribute( "value" ) === ""; -}) ) { - addHandle( "value", function( elem, name, isXML ) { - if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { - return elem.defaultValue; - } - }); -} - -// Support: IE<9 -// Use getAttributeNode to fetch booleans when getAttribute lies -if ( !assert(function( div ) { - return div.getAttribute("disabled") == null; -}) ) { - addHandle( booleans, function( elem, name, isXML ) { - var val; - if ( !isXML ) { - return elem[ name ] === true ? name.toLowerCase() : - (val = elem.getAttributeNode( name )) && val.specified ? - val.value : - null; - } - }); -} - -return Sizzle; - -})( window ); - - - -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.pseudos; -jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; - - - -var rneedsContext = jQuery.expr.match.needsContext; - -var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/); - - - -var risSimple = /^.[^:#\[\.,]*$/; - -// Implement the identical functionality for filter and not -function winnow( elements, qualifier, not ) { - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep( elements, function( elem, i ) { - /* jshint -W018 */ - return !!qualifier.call( elem, i, elem ) !== not; - }); - - } - - if ( qualifier.nodeType ) { - return jQuery.grep( elements, function( elem ) { - return ( elem === qualifier ) !== not; - }); - - } - - if ( typeof qualifier === "string" ) { - if ( risSimple.test( qualifier ) ) { - return jQuery.filter( qualifier, elements, not ); - } - - qualifier = jQuery.filter( qualifier, elements ); - } - - return jQuery.grep( elements, function( elem ) { - return ( indexOf.call( qualifier, elem ) >= 0 ) !== not; - }); -} - -jQuery.filter = function( expr, elems, not ) { - var elem = elems[ 0 ]; - - if ( not ) { - expr = ":not(" + expr + ")"; - } - - return elems.length === 1 && elem.nodeType === 1 ? - jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : - jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { - return elem.nodeType === 1; - })); -}; - -jQuery.fn.extend({ - find: function( selector ) { - var i, - len = this.length, - ret = [], - self = this; - - if ( typeof selector !== "string" ) { - return this.pushStack( jQuery( selector ).filter(function() { - for ( i = 0; i < len; i++ ) { - if ( jQuery.contains( self[ i ], this ) ) { - return true; - } - } - }) ); - } - - for ( i = 0; i < len; i++ ) { - jQuery.find( selector, self[ i ], ret ); - } - - // Needed because $( selector, context ) becomes $( context ).find( selector ) - ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); - ret.selector = this.selector ? this.selector + " " + selector : selector; - return ret; - }, - filter: function( selector ) { - return this.pushStack( winnow(this, selector || [], false) ); - }, - not: function( selector ) { - return this.pushStack( winnow(this, selector || [], true) ); - }, - is: function( selector ) { - return !!winnow( - this, - - // If this is a positional/relative selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - typeof selector === "string" && rneedsContext.test( selector ) ? - jQuery( selector ) : - selector || [], - false - ).length; - } -}); - - -// Initialize a jQuery object - - -// A central reference to the root jQuery(document) -var rootjQuery, - - // A simple way to check for HTML strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - // Strict HTML recognition (#11290: must start with <) - rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, - - init = jQuery.fn.init = function( selector, context ) { - var match, elem; - - // HANDLE: $(""), $(null), $(undefined), $(false) - if ( !selector ) { - return this; - } - - // Handle HTML strings - if ( typeof selector === "string" ) { - if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) { - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; - - } else { - match = rquickExpr.exec( selector ); - } - - // Match html or make sure no context is specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) { - context = context instanceof jQuery ? context[0] : context; - - // scripts is true for back-compat - // Intentionally let the error be thrown if parseHTML is not present - jQuery.merge( this, jQuery.parseHTML( - match[1], - context && context.nodeType ? context.ownerDocument || context : document, - true - ) ); - - // HANDLE: $(html, props) - if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { - for ( match in context ) { - // Properties of context are called as methods if possible - if ( jQuery.isFunction( this[ match ] ) ) { - this[ match ]( context[ match ] ); - - // ...and otherwise set as attributes - } else { - this.attr( match, context[ match ] ); - } - } - } - - return this; - - // HANDLE: $(#id) - } else { - elem = document.getElementById( match[2] ); - - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - // Inject the element directly into the jQuery object - this.length = 1; - this[0] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return ( context || rootjQuery ).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return this.constructor( context ).find( selector ); - } - - // HANDLE: $(DOMElement) - } else if ( selector.nodeType ) { - this.context = this[0] = selector; - this.length = 1; - return this; - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return typeof rootjQuery.ready !== "undefined" ? - rootjQuery.ready( selector ) : - // Execute immediately if ready is not present - selector( jQuery ); - } - - if ( selector.selector !== undefined ) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray( selector, this ); - }; - -// Give the init function the jQuery prototype for later instantiation -init.prototype = jQuery.fn; - -// Initialize central reference -rootjQuery = jQuery( document ); - - -var rparentsprev = /^(?:parents|prev(?:Until|All))/, - // methods guaranteed to produce a unique set when starting from a unique set - guaranteedUnique = { - children: true, - contents: true, - next: true, - prev: true - }; - -jQuery.extend({ - dir: function( elem, dir, until ) { - var matched = [], - truncate = until !== undefined; - - while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) { - if ( elem.nodeType === 1 ) { - if ( truncate && jQuery( elem ).is( until ) ) { - break; - } - matched.push( elem ); - } - } - return matched; - }, - - sibling: function( n, elem ) { - var matched = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - matched.push( n ); - } - } - - return matched; - } -}); - -jQuery.fn.extend({ - has: function( target ) { - var targets = jQuery( target, this ), - l = targets.length; - - return this.filter(function() { - var i = 0; - for ( ; i < l; i++ ) { - if ( jQuery.contains( this, targets[i] ) ) { - return true; - } - } - }); - }, - - closest: function( selectors, context ) { - var cur, - i = 0, - l = this.length, - matched = [], - pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? - jQuery( selectors, context || this.context ) : - 0; - - for ( ; i < l; i++ ) { - for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { - // Always skip document fragments - if ( cur.nodeType < 11 && (pos ? - pos.index(cur) > -1 : - - // Don't pass non-elements to Sizzle - cur.nodeType === 1 && - jQuery.find.matchesSelector(cur, selectors)) ) { - - matched.push( cur ); - break; - } - } - } - - return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched ); - }, - - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - - // No argument, return index in parent - if ( !elem ) { - return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; - } - - // index in selector - if ( typeof elem === "string" ) { - return indexOf.call( jQuery( elem ), this[ 0 ] ); - } - - // Locate the position of the desired element - return indexOf.call( this, - - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[ 0 ] : elem - ); - }, - - add: function( selector, context ) { - return this.pushStack( - jQuery.unique( - jQuery.merge( this.get(), jQuery( selector, context ) ) - ) - ); - }, - - addBack: function( selector ) { - return this.add( selector == null ? - this.prevObject : this.prevObject.filter(selector) - ); - } -}); - -function sibling( cur, dir ) { - while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {} - return cur; -} - -jQuery.each({ - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return jQuery.dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, i, until ) { - return jQuery.dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return sibling( elem, "nextSibling" ); - }, - prev: function( elem ) { - return sibling( elem, "previousSibling" ); - }, - nextAll: function( elem ) { - return jQuery.dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return jQuery.dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, i, until ) { - return jQuery.dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, i, until ) { - return jQuery.dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); - }, - children: function( elem ) { - return jQuery.sibling( elem.firstChild ); - }, - contents: function( elem ) { - return elem.contentDocument || jQuery.merge( [], elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var matched = jQuery.map( this, fn, until ); - - if ( name.slice( -5 ) !== "Until" ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - matched = jQuery.filter( selector, matched ); - } - - if ( this.length > 1 ) { - // Remove duplicates - if ( !guaranteedUnique[ name ] ) { - jQuery.unique( matched ); - } - - // Reverse order for parents* and prev-derivatives - if ( rparentsprev.test( name ) ) { - matched.reverse(); - } - } - - return this.pushStack( matched ); - }; -}); -var rnotwhite = (/\S+/g); - - - -// String to Object options format cache -var optionsCache = {}; - -// Convert String-formatted options into Object-formatted ones and store in cache -function createOptions( options ) { - var object = optionsCache[ options ] = {}; - jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { - object[ flag ] = true; - }); - return object; -} - -/* - * Create a callback list using the following parameters: - * - * options: an optional list of space-separated options that will change how - * the callback list behaves or a more traditional option object - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible options: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) - * - * stopOnFalse: interrupt callings when a callback returns false - * - */ -jQuery.Callbacks = function( options ) { - - // Convert options from String-formatted to Object-formatted if needed - // (we check in cache first) - options = typeof options === "string" ? - ( optionsCache[ options ] || createOptions( options ) ) : - jQuery.extend( {}, options ); - - var // Last fire value (for non-forgettable lists) - memory, - // Flag to know if list was already fired - fired, - // Flag to know if list is currently firing - firing, - // First callback to fire (used internally by add and fireWith) - firingStart, - // End of the loop when firing - firingLength, - // Index of currently firing callback (modified by remove if needed) - firingIndex, - // Actual callback list - list = [], - // Stack of fire calls for repeatable lists - stack = !options.once && [], - // Fire callbacks - fire = function( data ) { - memory = options.memory && data; - fired = true; - firingIndex = firingStart || 0; - firingStart = 0; - firingLength = list.length; - firing = true; - for ( ; list && firingIndex < firingLength; firingIndex++ ) { - if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { - memory = false; // To prevent further calls using add - break; - } - } - firing = false; - if ( list ) { - if ( stack ) { - if ( stack.length ) { - fire( stack.shift() ); - } - } else if ( memory ) { - list = []; - } else { - self.disable(); - } - } - }, - // Actual Callbacks object - self = { - // Add a callback or a collection of callbacks to the list - add: function() { - if ( list ) { - // First, we save the current length - var start = list.length; - (function add( args ) { - jQuery.each( args, function( _, arg ) { - var type = jQuery.type( arg ); - if ( type === "function" ) { - if ( !options.unique || !self.has( arg ) ) { - list.push( arg ); - } - } else if ( arg && arg.length && type !== "string" ) { - // Inspect recursively - add( arg ); - } - }); - })( arguments ); - // Do we need to add the callbacks to the - // current firing batch? - if ( firing ) { - firingLength = list.length; - // With memory, if we're not firing then - // we should call right away - } else if ( memory ) { - firingStart = start; - fire( memory ); - } - } - return this; - }, - // Remove a callback from the list - remove: function() { - if ( list ) { - jQuery.each( arguments, function( _, arg ) { - var index; - while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { - list.splice( index, 1 ); - // Handle firing indexes - if ( firing ) { - if ( index <= firingLength ) { - firingLength--; - } - if ( index <= firingIndex ) { - firingIndex--; - } - } - } - }); - } - return this; - }, - // Check if a given callback is in the list. - // If no argument is given, return whether or not list has callbacks attached. - has: function( fn ) { - return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); - }, - // Remove all callbacks from the list - empty: function() { - list = []; - firingLength = 0; - return this; - }, - // Have the list do nothing anymore - disable: function() { - list = stack = memory = undefined; - return this; - }, - // Is it disabled? - disabled: function() { - return !list; - }, - // Lock the list in its current state - lock: function() { - stack = undefined; - if ( !memory ) { - self.disable(); - } - return this; - }, - // Is it locked? - locked: function() { - return !stack; - }, - // Call all callbacks with the given context and arguments - fireWith: function( context, args ) { - if ( list && ( !fired || stack ) ) { - args = args || []; - args = [ context, args.slice ? args.slice() : args ]; - if ( firing ) { - stack.push( args ); - } else { - fire( args ); - } - } - return this; - }, - // Call all the callbacks with the given arguments - fire: function() { - self.fireWith( this, arguments ); - return this; - }, - // To know if the callbacks have already been called at least once - fired: function() { - return !!fired; - } - }; - - return self; -}; - - -jQuery.extend({ - - Deferred: function( func ) { - var tuples = [ - // action, add listener, listener list, final state - [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], - [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], - [ "notify", "progress", jQuery.Callbacks("memory") ] - ], - state = "pending", - promise = { - state: function() { - return state; - }, - always: function() { - deferred.done( arguments ).fail( arguments ); - return this; - }, - then: function( /* fnDone, fnFail, fnProgress */ ) { - var fns = arguments; - return jQuery.Deferred(function( newDefer ) { - jQuery.each( tuples, function( i, tuple ) { - var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; - // deferred[ done | fail | progress ] for forwarding actions to newDefer - deferred[ tuple[1] ](function() { - var returned = fn && fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise() - .done( newDefer.resolve ) - .fail( newDefer.reject ) - .progress( newDefer.notify ); - } else { - newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); - } - }); - }); - fns = null; - }).promise(); - }, - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - return obj != null ? jQuery.extend( obj, promise ) : promise; - } - }, - deferred = {}; - - // Keep pipe for back-compat - promise.pipe = promise.then; - - // Add list-specific methods - jQuery.each( tuples, function( i, tuple ) { - var list = tuple[ 2 ], - stateString = tuple[ 3 ]; - - // promise[ done | fail | progress ] = list.add - promise[ tuple[1] ] = list.add; - - // Handle state - if ( stateString ) { - list.add(function() { - // state = [ resolved | rejected ] - state = stateString; - - // [ reject_list | resolve_list ].disable; progress_list.lock - }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); - } - - // deferred[ resolve | reject | notify ] - deferred[ tuple[0] ] = function() { - deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); - return this; - }; - deferred[ tuple[0] + "With" ] = list.fireWith; - }); - - // Make the deferred a promise - promise.promise( deferred ); - - // Call given func if any - if ( func ) { - func.call( deferred, deferred ); - } - - // All done! - return deferred; - }, - - // Deferred helper - when: function( subordinate /* , ..., subordinateN */ ) { - var i = 0, - resolveValues = slice.call( arguments ), - length = resolveValues.length, - - // the count of uncompleted subordinates - remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, - - // the master Deferred. If resolveValues consist of only a single Deferred, just use that. - deferred = remaining === 1 ? subordinate : jQuery.Deferred(), - - // Update function for both resolve and progress values - updateFunc = function( i, contexts, values ) { - return function( value ) { - contexts[ i ] = this; - values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; - if ( values === progressValues ) { - deferred.notifyWith( contexts, values ); - } else if ( !( --remaining ) ) { - deferred.resolveWith( contexts, values ); - } - }; - }, - - progressValues, progressContexts, resolveContexts; - - // add listeners to Deferred subordinates; treat others as resolved - if ( length > 1 ) { - progressValues = new Array( length ); - progressContexts = new Array( length ); - resolveContexts = new Array( length ); - for ( ; i < length; i++ ) { - if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { - resolveValues[ i ].promise() - .done( updateFunc( i, resolveContexts, resolveValues ) ) - .fail( deferred.reject ) - .progress( updateFunc( i, progressContexts, progressValues ) ); - } else { - --remaining; - } - } - } - - // if we're not waiting on anything, resolve the master - if ( !remaining ) { - deferred.resolveWith( resolveContexts, resolveValues ); - } - - return deferred.promise(); - } -}); - - -// The deferred used on DOM ready -var readyList; - -jQuery.fn.ready = function( fn ) { - // Add the callback - jQuery.ready.promise().done( fn ); - - return this; -}; - -jQuery.extend({ - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // A counter to track how many items to wait for before - // the ready event fires. See #6781 - readyWait: 1, - - // Hold (or release) the ready event - holdReady: function( hold ) { - if ( hold ) { - jQuery.readyWait++; - } else { - jQuery.ready( true ); - } - }, - - // Handle when the DOM is ready - ready: function( wait ) { - - // Abort if there are pending holds or we're already ready - if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { - return; - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { - return; - } - - // If there are functions bound, to execute - readyList.resolveWith( document, [ jQuery ] ); - - // Trigger any bound ready events - if ( jQuery.fn.triggerHandler ) { - jQuery( document ).triggerHandler( "ready" ); - jQuery( document ).off( "ready" ); - } - } -}); - -/** - * The ready event handler and self cleanup method - */ -function completed() { - document.removeEventListener( "DOMContentLoaded", completed, false ); - window.removeEventListener( "load", completed, false ); - jQuery.ready(); -} - -jQuery.ready.promise = function( obj ) { - if ( !readyList ) { - - readyList = jQuery.Deferred(); - - // Catch cases where $(document).ready() is called after the browser event has already occurred. - // we once tried to use readyState "interactive" here, but it caused issues like the one - // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 - if ( document.readyState === "complete" ) { - // Handle it asynchronously to allow scripts the opportunity to delay ready - setTimeout( jQuery.ready ); - - } else { - - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", completed, false ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", completed, false ); - } - } - return readyList.promise( obj ); -}; - -// Kick off the DOM ready check even if the user does not -jQuery.ready.promise(); - - - - -// Multifunctional method to get and set values of a collection -// The value/s can optionally be executed if it's a function -var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) { - var i = 0, - len = elems.length, - bulk = key == null; - - // Sets many values - if ( jQuery.type( key ) === "object" ) { - chainable = true; - for ( i in key ) { - jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); - } - - // Sets one value - } else if ( value !== undefined ) { - chainable = true; - - if ( !jQuery.isFunction( value ) ) { - raw = true; - } - - if ( bulk ) { - // Bulk operations run against the entire set - if ( raw ) { - fn.call( elems, value ); - fn = null; - - // ...except when executing function values - } else { - bulk = fn; - fn = function( elem, key, value ) { - return bulk.call( jQuery( elem ), value ); - }; - } - } - - if ( fn ) { - for ( ; i < len; i++ ) { - fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); - } - } - } - - return chainable ? - elems : - - // Gets - bulk ? - fn.call( elems ) : - len ? fn( elems[0], key ) : emptyGet; -}; - - -/** - * Determines whether an object can have data - */ -jQuery.acceptData = function( owner ) { - // Accepts only: - // - Node - // - Node.ELEMENT_NODE - // - Node.DOCUMENT_NODE - // - Object - // - Any - /* jshint -W018 */ - return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); -}; - - -function Data() { - // Support: Android < 4, - // Old WebKit does not have Object.preventExtensions/freeze method, - // return new empty object instead with no [[set]] accessor - Object.defineProperty( this.cache = {}, 0, { - get: function() { - return {}; - } - }); - - this.expando = jQuery.expando + Math.random(); -} - -Data.uid = 1; -Data.accepts = jQuery.acceptData; - -Data.prototype = { - key: function( owner ) { - // We can accept data for non-element nodes in modern browsers, - // but we should not, see #8335. - // Always return the key for a frozen object. - if ( !Data.accepts( owner ) ) { - return 0; - } - - var descriptor = {}, - // Check if the owner object already has a cache key - unlock = owner[ this.expando ]; - - // If not, create one - if ( !unlock ) { - unlock = Data.uid++; - - // Secure it in a non-enumerable, non-writable property - try { - descriptor[ this.expando ] = { value: unlock }; - Object.defineProperties( owner, descriptor ); - - // Support: Android < 4 - // Fallback to a less secure definition - } catch ( e ) { - descriptor[ this.expando ] = unlock; - jQuery.extend( owner, descriptor ); - } - } - - // Ensure the cache object - if ( !this.cache[ unlock ] ) { - this.cache[ unlock ] = {}; - } - - return unlock; - }, - set: function( owner, data, value ) { - var prop, - // There may be an unlock assigned to this node, - // if there is no entry for this "owner", create one inline - // and set the unlock as though an owner entry had always existed - unlock = this.key( owner ), - cache = this.cache[ unlock ]; - - // Handle: [ owner, key, value ] args - if ( typeof data === "string" ) { - cache[ data ] = value; - - // Handle: [ owner, { properties } ] args - } else { - // Fresh assignments by object are shallow copied - if ( jQuery.isEmptyObject( cache ) ) { - jQuery.extend( this.cache[ unlock ], data ); - // Otherwise, copy the properties one-by-one to the cache object - } else { - for ( prop in data ) { - cache[ prop ] = data[ prop ]; - } - } - } - return cache; - }, - get: function( owner, key ) { - // Either a valid cache is found, or will be created. - // New caches will be created and the unlock returned, - // allowing direct access to the newly created - // empty data object. A valid owner object must be provided. - var cache = this.cache[ this.key( owner ) ]; - - return key === undefined ? - cache : cache[ key ]; - }, - access: function( owner, key, value ) { - var stored; - // In cases where either: - // - // 1. No key was specified - // 2. A string key was specified, but no value provided - // - // Take the "read" path and allow the get method to determine - // which value to return, respectively either: - // - // 1. The entire cache object - // 2. The data stored at the key - // - if ( key === undefined || - ((key && typeof key === "string") && value === undefined) ) { - - stored = this.get( owner, key ); - - return stored !== undefined ? - stored : this.get( owner, jQuery.camelCase(key) ); - } - - // [*]When the key is not a string, or both a key and value - // are specified, set or extend (existing objects) with either: - // - // 1. An object of properties - // 2. A key and value - // - this.set( owner, key, value ); - - // Since the "set" path can have two possible entry points - // return the expected data based on which path was taken[*] - return value !== undefined ? value : key; - }, - remove: function( owner, key ) { - var i, name, camel, - unlock = this.key( owner ), - cache = this.cache[ unlock ]; - - if ( key === undefined ) { - this.cache[ unlock ] = {}; - - } else { - // Support array or space separated string of keys - if ( jQuery.isArray( key ) ) { - // If "name" is an array of keys... - // When data is initially created, via ("key", "val") signature, - // keys will be converted to camelCase. - // Since there is no way to tell _how_ a key was added, remove - // both plain key and camelCase key. #12786 - // This will only penalize the array argument path. - name = key.concat( key.map( jQuery.camelCase ) ); - } else { - camel = jQuery.camelCase( key ); - // Try the string as a key before any manipulation - if ( key in cache ) { - name = [ key, camel ]; - } else { - // If a key with the spaces exists, use it. - // Otherwise, create an array by matching non-whitespace - name = camel; - name = name in cache ? - [ name ] : ( name.match( rnotwhite ) || [] ); - } - } - - i = name.length; - while ( i-- ) { - delete cache[ name[ i ] ]; - } - } - }, - hasData: function( owner ) { - return !jQuery.isEmptyObject( - this.cache[ owner[ this.expando ] ] || {} - ); - }, - discard: function( owner ) { - if ( owner[ this.expando ] ) { - delete this.cache[ owner[ this.expando ] ]; - } - } -}; -var data_priv = new Data(); - -var data_user = new Data(); - - - -/* - Implementation Summary - - 1. Enforce API surface and semantic compatibility with 1.9.x branch - 2. Improve the module's maintainability by reducing the storage - paths to a single mechanism. - 3. Use the same single mechanism to support "private" and "user" data. - 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) - 5. Avoid exposing implementation details on user objects (eg. expando properties) - 6. Provide a clear path for implementation upgrade to WeakMap in 2014 -*/ -var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, - rmultiDash = /([A-Z])/g; - -function dataAttr( elem, key, data ) { - var name; - - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { - name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); - data = elem.getAttribute( name ); - - if ( typeof data === "string" ) { - try { - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - // Only convert to a number if it doesn't change the string - +data + "" === data ? +data : - rbrace.test( data ) ? jQuery.parseJSON( data ) : - data; - } catch( e ) {} - - // Make sure we set the data so it isn't changed later - data_user.set( elem, key, data ); - } else { - data = undefined; - } - } - return data; -} - -jQuery.extend({ - hasData: function( elem ) { - return data_user.hasData( elem ) || data_priv.hasData( elem ); - }, - - data: function( elem, name, data ) { - return data_user.access( elem, name, data ); - }, - - removeData: function( elem, name ) { - data_user.remove( elem, name ); - }, - - // TODO: Now that all calls to _data and _removeData have been replaced - // with direct calls to data_priv methods, these can be deprecated. - _data: function( elem, name, data ) { - return data_priv.access( elem, name, data ); - }, - - _removeData: function( elem, name ) { - data_priv.remove( elem, name ); - } -}); - -jQuery.fn.extend({ - data: function( key, value ) { - var i, name, data, - elem = this[ 0 ], - attrs = elem && elem.attributes; - - // Gets all values - if ( key === undefined ) { - if ( this.length ) { - data = data_user.get( elem ); - - if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) { - i = attrs.length; - while ( i-- ) { - - // Support: IE11+ - // The attrs elements can be null (#14894) - if ( attrs[ i ] ) { - name = attrs[ i ].name; - if ( name.indexOf( "data-" ) === 0 ) { - name = jQuery.camelCase( name.slice(5) ); - dataAttr( elem, name, data[ name ] ); - } - } - } - data_priv.set( elem, "hasDataAttrs", true ); - } - } - - return data; - } - - // Sets multiple values - if ( typeof key === "object" ) { - return this.each(function() { - data_user.set( this, key ); - }); - } - - return access( this, function( value ) { - var data, - camelKey = jQuery.camelCase( key ); - - // The calling jQuery object (element matches) is not empty - // (and therefore has an element appears at this[ 0 ]) and the - // `value` parameter was not undefined. An empty jQuery object - // will result in `undefined` for elem = this[ 0 ] which will - // throw an exception if an attempt to read a data cache is made. - if ( elem && value === undefined ) { - // Attempt to get data from the cache - // with the key as-is - data = data_user.get( elem, key ); - if ( data !== undefined ) { - return data; - } - - // Attempt to get data from the cache - // with the key camelized - data = data_user.get( elem, camelKey ); - if ( data !== undefined ) { - return data; - } - - // Attempt to "discover" the data in - // HTML5 custom data-* attrs - data = dataAttr( elem, camelKey, undefined ); - if ( data !== undefined ) { - return data; - } - - // We tried really hard, but the data doesn't exist. - return; - } - - // Set the data... - this.each(function() { - // First, attempt to store a copy or reference of any - // data that might've been store with a camelCased key. - var data = data_user.get( this, camelKey ); - - // For HTML5 data-* attribute interop, we have to - // store property names with dashes in a camelCase form. - // This might not apply to all properties...* - data_user.set( this, camelKey, value ); - - // *... In the case of properties that might _actually_ - // have dashes, we need to also store a copy of that - // unchanged property. - if ( key.indexOf("-") !== -1 && data !== undefined ) { - data_user.set( this, key, value ); - } - }); - }, null, value, arguments.length > 1, null, true ); - }, - - removeData: function( key ) { - return this.each(function() { - data_user.remove( this, key ); - }); - } -}); - - -jQuery.extend({ - queue: function( elem, type, data ) { - var queue; - - if ( elem ) { - type = ( type || "fx" ) + "queue"; - queue = data_priv.get( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !queue || jQuery.isArray( data ) ) { - queue = data_priv.access( elem, type, jQuery.makeArray(data) ); - } else { - queue.push( data ); - } - } - return queue || []; - } - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), - startLength = queue.length, - fn = queue.shift(), - hooks = jQuery._queueHooks( elem, type ), - next = function() { - jQuery.dequeue( elem, type ); - }; - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - startLength--; - } - - if ( fn ) { - - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift( "inprogress" ); - } - - // clear up the last queue stop function - delete hooks.stop; - fn.call( elem, next, hooks ); - } - - if ( !startLength && hooks ) { - hooks.empty.fire(); - } - }, - - // not intended for public consumption - generates a queueHooks object, or returns the current one - _queueHooks: function( elem, type ) { - var key = type + "queueHooks"; - return data_priv.get( elem, key ) || data_priv.access( elem, key, { - empty: jQuery.Callbacks("once memory").add(function() { - data_priv.remove( elem, [ type + "queue", key ] ); - }) - }); - } -}); - -jQuery.fn.extend({ - queue: function( type, data ) { - var setter = 2; - - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - setter--; - } - - if ( arguments.length < setter ) { - return jQuery.queue( this[0], type ); - } - - return data === undefined ? - this : - this.each(function() { - var queue = jQuery.queue( this, type, data ); - - // ensure a hooks for this queue - jQuery._queueHooks( this, type ); - - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - }); - }, - dequeue: function( type ) { - return this.each(function() { - jQuery.dequeue( this, type ); - }); - }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - }, - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function( type, obj ) { - var tmp, - count = 1, - defer = jQuery.Deferred(), - elements = this, - i = this.length, - resolve = function() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); - } - }; - - if ( typeof type !== "string" ) { - obj = type; - type = undefined; - } - type = type || "fx"; - - while ( i-- ) { - tmp = data_priv.get( elements[ i ], type + "queueHooks" ); - if ( tmp && tmp.empty ) { - count++; - tmp.empty.add( resolve ); - } - } - resolve(); - return defer.promise( obj ); - } -}); -var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source; - -var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; - -var isHidden = function( elem, el ) { - // isHidden might be called from jQuery#filter function; - // in that case, element will be second argument - elem = el || elem; - return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); - }; - -var rcheckableType = (/^(?:checkbox|radio)$/i); - - - -(function() { - var fragment = document.createDocumentFragment(), - div = fragment.appendChild( document.createElement( "div" ) ), - input = document.createElement( "input" ); - - // #11217 - WebKit loses check when the name is after the checked attribute - // Support: Windows Web Apps (WWA) - // `name` and `type` need .setAttribute for WWA - input.setAttribute( "type", "radio" ); - input.setAttribute( "checked", "checked" ); - input.setAttribute( "name", "t" ); - - div.appendChild( input ); - - // Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3 - // old WebKit doesn't clone checked state correctly in fragments - support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; - - // Make sure textarea (and checkbox) defaultValue is properly cloned - // Support: IE9-IE11+ - div.innerHTML = ""; - support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; -})(); -var strundefined = typeof undefined; - - - -support.focusinBubbles = "onfocusin" in window; - - -var - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/, - rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; - -function returnTrue() { - return true; -} - -function returnFalse() { - return false; -} - -function safeActiveElement() { - try { - return document.activeElement; - } catch ( err ) { } -} - -/* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ -jQuery.event = { - - global: {}, - - add: function( elem, types, handler, data, selector ) { - - var handleObjIn, eventHandle, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = data_priv.get( elem ); - - // Don't attach events to noData or text/comment nodes (but allow plain objects) - if ( !elemData ) { - return; - } - - // Caller can pass in an object of custom data in lieu of the handler - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - selector = handleObjIn.selector; - } - - // Make sure that the handler has a unique ID, used to find/remove it later - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure and main handler, if this is the first - if ( !(events = elemData.events) ) { - events = elemData.events = {}; - } - if ( !(eventHandle = elemData.handle) ) { - eventHandle = elemData.handle = function( e ) { - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ? - jQuery.event.dispatch.apply( elem, arguments ) : undefined; - }; - } - - // Handle multiple events separated by a space - types = ( types || "" ).match( rnotwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[t] ) || []; - type = origType = tmp[1]; - namespaces = ( tmp[2] || "" ).split( "." ).sort(); - - // There *must* be a type, no attaching namespace-only handlers - if ( !type ) { - continue; - } - - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[ type ] || {}; - - // If selector defined, determine special event api type, otherwise given type - type = ( selector ? special.delegateType : special.bindType ) || type; - - // Update special based on newly reset type - special = jQuery.event.special[ type ] || {}; - - // handleObj is passed to all event handlers - handleObj = jQuery.extend({ - type: type, - origType: origType, - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - needsContext: selector && jQuery.expr.match.needsContext.test( selector ), - namespace: namespaces.join(".") - }, handleObjIn ); - - // Init the event handler queue if we're the first - if ( !(handlers = events[ type ]) ) { - handlers = events[ type ] = []; - handlers.delegateCount = 0; - - // Only use addEventListener if the special events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add to the element's handler list, delegates in front - if ( selector ) { - handlers.splice( handlers.delegateCount++, 0, handleObj ); - } else { - handlers.push( handleObj ); - } - - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[ type ] = true; - } - - }, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, selector, mappedTypes ) { - - var j, origCount, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = data_priv.hasData( elem ) && data_priv.get( elem ); - - if ( !elemData || !(events = elemData.events) ) { - return; - } - - // Once for each type.namespace in types; type may be omitted - types = ( types || "" ).match( rnotwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[t] ) || []; - type = origType = tmp[1]; - namespaces = ( tmp[2] || "" ).split( "." ).sort(); - - // Unbind all events (on this namespace, if provided) for the element - if ( !type ) { - for ( type in events ) { - jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); - } - continue; - } - - special = jQuery.event.special[ type ] || {}; - type = ( selector ? special.delegateType : special.bindType ) || type; - handlers = events[ type ] || []; - tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); - - // Remove matching events - origCount = j = handlers.length; - while ( j-- ) { - handleObj = handlers[ j ]; - - if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !tmp || tmp.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { - handlers.splice( j, 1 ); - - if ( handleObj.selector ) { - handlers.delegateCount--; - } - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - } - - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if ( origCount && !handlers.length ) { - if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { - jQuery.removeEvent( elem, type, elemData.handle ); - } - - delete events[ type ]; - } - } - - // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - delete elemData.handle; - data_priv.remove( elem, "events" ); - } - }, - - trigger: function( event, data, elem, onlyHandlers ) { - - var i, cur, tmp, bubbleType, ontype, handle, special, - eventPath = [ elem || document ], - type = hasOwn.call( event, "type" ) ? event.type : event, - namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; - - cur = tmp = elem = elem || document; - - // Don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - // focus/blur morphs to focusin/out; ensure we're not firing them right now - if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { - return; - } - - if ( type.indexOf(".") >= 0 ) { - // Namespaced trigger; create a regexp to match event type in handle() - namespaces = type.split("."); - type = namespaces.shift(); - namespaces.sort(); - } - ontype = type.indexOf(":") < 0 && "on" + type; - - // Caller can pass in a jQuery.Event object, Object, or just an event type string - event = event[ jQuery.expando ] ? - event : - new jQuery.Event( type, typeof event === "object" && event ); - - // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) - event.isTrigger = onlyHandlers ? 2 : 3; - event.namespace = namespaces.join("."); - event.namespace_re = event.namespace ? - new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : - null; - - // Clean up the event in case it is being reused - event.result = undefined; - if ( !event.target ) { - event.target = elem; - } - - // Clone any incoming data and prepend the event, creating the handler arg list - data = data == null ? - [ event ] : - jQuery.makeArray( data, [ event ] ); - - // Allow special events to draw outside the lines - special = jQuery.event.special[ type ] || {}; - if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { - return; - } - - // Determine event propagation path in advance, per W3C events spec (#9951) - // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { - - bubbleType = special.delegateType || type; - if ( !rfocusMorph.test( bubbleType + type ) ) { - cur = cur.parentNode; - } - for ( ; cur; cur = cur.parentNode ) { - eventPath.push( cur ); - tmp = cur; - } - - // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( tmp === (elem.ownerDocument || document) ) { - eventPath.push( tmp.defaultView || tmp.parentWindow || window ); - } - } - - // Fire handlers on the event path - i = 0; - while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { - - event.type = i > 1 ? - bubbleType : - special.bindType || type; - - // jQuery handler - handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" ); - if ( handle ) { - handle.apply( cur, data ); - } - - // Native handler - handle = ontype && cur[ ontype ]; - if ( handle && handle.apply && jQuery.acceptData( cur ) ) { - event.result = handle.apply( cur, data ); - if ( event.result === false ) { - event.preventDefault(); - } - } - } - event.type = type; - - // If nobody prevented the default action, do it now - if ( !onlyHandlers && !event.isDefaultPrevented() ) { - - if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && - jQuery.acceptData( elem ) ) { - - // Call a native DOM method on the target with the same name name as the event. - // Don't do default actions on window, that's where global variables be (#6170) - if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) { - - // Don't re-trigger an onFOO event when we call its FOO() method - tmp = elem[ ontype ]; - - if ( tmp ) { - elem[ ontype ] = null; - } - - // Prevent re-triggering of the same event, since we already bubbled it above - jQuery.event.triggered = type; - elem[ type ](); - jQuery.event.triggered = undefined; - - if ( tmp ) { - elem[ ontype ] = tmp; - } - } - } - } - - return event.result; - }, - - dispatch: function( event ) { - - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( event ); - - var i, j, ret, matched, handleObj, - handlerQueue = [], - args = slice.call( arguments ), - handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [], - special = jQuery.event.special[ event.type ] || {}; - - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[0] = event; - event.delegateTarget = this; - - // Call the preDispatch hook for the mapped type, and let it bail if desired - if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { - return; - } - - // Determine handlers - handlerQueue = jQuery.event.handlers.call( this, event, handlers ); - - // Run delegates first; they may want to stop propagation beneath us - i = 0; - while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { - event.currentTarget = matched.elem; - - j = 0; - while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { - - // Triggered event must either 1) have no namespace, or - // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). - if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { - - event.handleObj = handleObj; - event.data = handleObj.data; - - ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) - .apply( matched.elem, args ); - - if ( ret !== undefined ) { - if ( (event.result = ret) === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - // Call the postDispatch hook for the mapped type - if ( special.postDispatch ) { - special.postDispatch.call( this, event ); - } - - return event.result; - }, - - handlers: function( event, handlers ) { - var i, matches, sel, handleObj, - handlerQueue = [], - delegateCount = handlers.delegateCount, - cur = event.target; - - // Find delegate handlers - // Black-hole SVG instance trees (#13180) - // Avoid non-left-click bubbling in Firefox (#3861) - if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { - - for ( ; cur !== this; cur = cur.parentNode || this ) { - - // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) - if ( cur.disabled !== true || event.type !== "click" ) { - matches = []; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - - // Don't conflict with Object.prototype properties (#13203) - sel = handleObj.selector + " "; - - if ( matches[ sel ] === undefined ) { - matches[ sel ] = handleObj.needsContext ? - jQuery( sel, this ).index( cur ) >= 0 : - jQuery.find( sel, this, null, [ cur ] ).length; - } - if ( matches[ sel ] ) { - matches.push( handleObj ); - } - } - if ( matches.length ) { - handlerQueue.push({ elem: cur, handlers: matches }); - } - } - } - } - - // Add the remaining (directly-bound) handlers - if ( delegateCount < handlers.length ) { - handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); - } - - return handlerQueue; - }, - - // Includes some event props shared by KeyEvent and MouseEvent - props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), - - fixHooks: {}, - - keyHooks: { - props: "char charCode key keyCode".split(" "), - filter: function( event, original ) { - - // Add which for key events - if ( event.which == null ) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "), - filter: function( event, original ) { - var eventDoc, doc, body, - button = original.button; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && original.clientX != null ) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && button !== undefined ) { - event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); - } - - return event; - } - }, - - fix: function( event ) { - if ( event[ jQuery.expando ] ) { - return event; - } - - // Create a writable copy of the event object and normalize some properties - var i, prop, copy, - type = event.type, - originalEvent = event, - fixHook = this.fixHooks[ type ]; - - if ( !fixHook ) { - this.fixHooks[ type ] = fixHook = - rmouseEvent.test( type ) ? this.mouseHooks : - rkeyEvent.test( type ) ? this.keyHooks : - {}; - } - copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - - event = new jQuery.Event( originalEvent ); - - i = copy.length; - while ( i-- ) { - prop = copy[ i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Support: Cordova 2.5 (WebKit) (#13255) - // All events should have a target; Cordova deviceready doesn't - if ( !event.target ) { - event.target = document; - } - - // Support: Safari 6.0+, Chrome < 28 - // Target should not be a text node (#504, #13143) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; - }, - - special: { - load: { - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - focus: { - // Fire native event if possible so blur/focus sequence is correct - trigger: function() { - if ( this !== safeActiveElement() && this.focus ) { - this.focus(); - return false; - } - }, - delegateType: "focusin" - }, - blur: { - trigger: function() { - if ( this === safeActiveElement() && this.blur ) { - this.blur(); - return false; - } - }, - delegateType: "focusout" - }, - click: { - // For checkbox, fire native event so checked state will be right - trigger: function() { - if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) { - this.click(); - return false; - } - }, - - // For cross-browser consistency, don't fire native .click() on links - _default: function( event ) { - return jQuery.nodeName( event.target, "a" ); - } - }, - - beforeunload: { - postDispatch: function( event ) { - - // Support: Firefox 20+ - // Firefox doesn't alert if the returnValue field is not set. - if ( event.result !== undefined && event.originalEvent ) { - event.originalEvent.returnValue = event.result; - } - } - } - }, - - simulate: function( type, elem, event, bubble ) { - // Piggyback on a donor event to simulate a different one. - // Fake originalEvent to avoid donor's stopPropagation, but if the - // simulated event prevents default then we do the same on the donor. - var e = jQuery.extend( - new jQuery.Event(), - event, - { - type: type, - isSimulated: true, - originalEvent: {} - } - ); - if ( bubble ) { - jQuery.event.trigger( e, null, elem ); - } else { - jQuery.event.dispatch.call( elem, e ); - } - if ( e.isDefaultPrevented() ) { - event.preventDefault(); - } - } -}; - -jQuery.removeEvent = function( elem, type, handle ) { - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle, false ); - } -}; - -jQuery.Event = function( src, props ) { - // Allow instantiation without the 'new' keyword - if ( !(this instanceof jQuery.Event) ) { - return new jQuery.Event( src, props ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = src.defaultPrevented || - src.defaultPrevented === undefined && - // Support: Android < 4.0 - src.returnValue === false ? - returnTrue : - returnFalse; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || jQuery.now(); - - // Mark it as fixed - this[ jQuery.expando ] = true; -}; - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse, - - preventDefault: function() { - var e = this.originalEvent; - - this.isDefaultPrevented = returnTrue; - - if ( e && e.preventDefault ) { - e.preventDefault(); - } - }, - stopPropagation: function() { - var e = this.originalEvent; - - this.isPropagationStopped = returnTrue; - - if ( e && e.stopPropagation ) { - e.stopPropagation(); - } - }, - stopImmediatePropagation: function() { - var e = this.originalEvent; - - this.isImmediatePropagationStopped = returnTrue; - - if ( e && e.stopImmediatePropagation ) { - e.stopImmediatePropagation(); - } - - this.stopPropagation(); - } -}; - -// Create mouseenter/leave events using mouseover/out and event-time checks -// Support: Chrome 15+ -jQuery.each({ - mouseenter: "mouseover", - mouseleave: "mouseout", - pointerenter: "pointerover", - pointerleave: "pointerout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - delegateType: fix, - bindType: fix, - - handle: function( event ) { - var ret, - target = this, - related = event.relatedTarget, - handleObj = event.handleObj; - - // For mousenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || (related !== target && !jQuery.contains( target, related )) ) { - event.type = handleObj.origType; - ret = handleObj.handler.apply( this, arguments ); - event.type = fix; - } - return ret; - } - }; -}); - -// Create "bubbling" focus and blur events -// Support: Firefox, Chrome, Safari -if ( !support.focusinBubbles ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - - // Attach a single capturing handler on the document while someone wants focusin/focusout - var handler = function( event ) { - jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); - }; - - jQuery.event.special[ fix ] = { - setup: function() { - var doc = this.ownerDocument || this, - attaches = data_priv.access( doc, fix ); - - if ( !attaches ) { - doc.addEventListener( orig, handler, true ); - } - data_priv.access( doc, fix, ( attaches || 0 ) + 1 ); - }, - teardown: function() { - var doc = this.ownerDocument || this, - attaches = data_priv.access( doc, fix ) - 1; - - if ( !attaches ) { - doc.removeEventListener( orig, handler, true ); - data_priv.remove( doc, fix ); - - } else { - data_priv.access( doc, fix, attaches ); - } - } - }; - }); -} - -jQuery.fn.extend({ - - on: function( types, selector, data, fn, /*INTERNAL*/ one ) { - var origFn, type; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for ( type in types ) { - this.on( type, selector, data, types[ type ], one ); - } - return this; - } - - if ( data == null && fn == null ) { - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return this; - } - - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); - }; - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return this.each( function() { - jQuery.event.add( this, types, fn, data, selector ); - }); - }, - one: function( types, selector, data, fn ) { - return this.on( types, selector, data, fn, 1 ); - }, - off: function( types, selector, fn ) { - var handleObj, type; - if ( types && types.preventDefault && types.handleObj ) { - // ( event ) dispatched jQuery.Event - handleObj = types.handleObj; - jQuery( types.delegateTarget ).off( - handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, - handleObj.selector, - handleObj.handler - ); - return this; - } - if ( typeof types === "object" ) { - // ( types-object [, selector] ) - for ( type in types ) { - this.off( type, selector, types[ type ] ); - } - return this; - } - if ( selector === false || typeof selector === "function" ) { - // ( types [, fn] ) - fn = selector; - selector = undefined; - } - if ( fn === false ) { - fn = returnFalse; - } - return this.each(function() { - jQuery.event.remove( this, types, fn, selector ); - }); - }, - - trigger: function( type, data ) { - return this.each(function() { - jQuery.event.trigger( type, data, this ); - }); - }, - triggerHandler: function( type, data ) { - var elem = this[0]; - if ( elem ) { - return jQuery.event.trigger( type, data, elem, true ); - } - } -}); - - -var - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, - rtagName = /<([\w:]+)/, - rhtml = /<|&#?\w+;/, - rnoInnerhtml = /<(?:script|style|link)/i, - // checked="checked" or checked - rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, - rscriptType = /^$|\/(?:java|ecma)script/i, - rscriptTypeMasked = /^true\/(.*)/, - rcleanScript = /^\s*\s*$/g, - - // We have to close these tags to support XHTML (#13200) - wrapMap = { - - // Support: IE 9 - option: [ 1, "" ], - - thead: [ 1, "", "
    " ], - col: [ 2, "", "
    " ], - tr: [ 2, "", "
    " ], - td: [ 3, "", "
    " ], - - _default: [ 0, "", "" ] - }; - -// Support: IE 9 -wrapMap.optgroup = wrapMap.option; - -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - -// Support: 1.x compatibility -// Manipulating tables requires a tbody -function manipulationTarget( elem, content ) { - return jQuery.nodeName( elem, "table" ) && - jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? - - elem.getElementsByTagName("tbody")[0] || - elem.appendChild( elem.ownerDocument.createElement("tbody") ) : - elem; -} - -// Replace/restore the type attribute of script elements for safe DOM manipulation -function disableScript( elem ) { - elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type; - return elem; -} -function restoreScript( elem ) { - var match = rscriptTypeMasked.exec( elem.type ); - - if ( match ) { - elem.type = match[ 1 ]; - } else { - elem.removeAttribute("type"); - } - - return elem; -} - -// Mark scripts as having already been evaluated -function setGlobalEval( elems, refElements ) { - var i = 0, - l = elems.length; - - for ( ; i < l; i++ ) { - data_priv.set( - elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" ) - ); - } -} - -function cloneCopyEvent( src, dest ) { - var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; - - if ( dest.nodeType !== 1 ) { - return; - } - - // 1. Copy private data: events, handlers, etc. - if ( data_priv.hasData( src ) ) { - pdataOld = data_priv.access( src ); - pdataCur = data_priv.set( dest, pdataOld ); - events = pdataOld.events; - - if ( events ) { - delete pdataCur.handle; - pdataCur.events = {}; - - for ( type in events ) { - for ( i = 0, l = events[ type ].length; i < l; i++ ) { - jQuery.event.add( dest, type, events[ type ][ i ] ); - } - } - } - } - - // 2. Copy user data - if ( data_user.hasData( src ) ) { - udataOld = data_user.access( src ); - udataCur = jQuery.extend( {}, udataOld ); - - data_user.set( dest, udataCur ); - } -} - -function getAll( context, tag ) { - var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) : - context.querySelectorAll ? context.querySelectorAll( tag || "*" ) : - []; - - return tag === undefined || tag && jQuery.nodeName( context, tag ) ? - jQuery.merge( [ context ], ret ) : - ret; -} - -// Support: IE >= 9 -function fixInput( src, dest ) { - var nodeName = dest.nodeName.toLowerCase(); - - // Fails to persist the checked state of a cloned checkbox or radio button. - if ( nodeName === "input" && rcheckableType.test( src.type ) ) { - dest.checked = src.checked; - - // Fails to return the selected option to the default selected state when cloning options - } else if ( nodeName === "input" || nodeName === "textarea" ) { - dest.defaultValue = src.defaultValue; - } -} - -jQuery.extend({ - clone: function( elem, dataAndEvents, deepDataAndEvents ) { - var i, l, srcElements, destElements, - clone = elem.cloneNode( true ), - inPage = jQuery.contains( elem.ownerDocument, elem ); - - // Support: IE >= 9 - // Fix Cloning issues - if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && - !jQuery.isXMLDoc( elem ) ) { - - // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 - destElements = getAll( clone ); - srcElements = getAll( elem ); - - for ( i = 0, l = srcElements.length; i < l; i++ ) { - fixInput( srcElements[ i ], destElements[ i ] ); - } - } - - // Copy the events from the original to the clone - if ( dataAndEvents ) { - if ( deepDataAndEvents ) { - srcElements = srcElements || getAll( elem ); - destElements = destElements || getAll( clone ); - - for ( i = 0, l = srcElements.length; i < l; i++ ) { - cloneCopyEvent( srcElements[ i ], destElements[ i ] ); - } - } else { - cloneCopyEvent( elem, clone ); - } - } - - // Preserve script evaluation history - destElements = getAll( clone, "script" ); - if ( destElements.length > 0 ) { - setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); - } - - // Return the cloned set - return clone; - }, - - buildFragment: function( elems, context, scripts, selection ) { - var elem, tmp, tag, wrap, contains, j, - fragment = context.createDocumentFragment(), - nodes = [], - i = 0, - l = elems.length; - - for ( ; i < l; i++ ) { - elem = elems[ i ]; - - if ( elem || elem === 0 ) { - - // Add nodes directly - if ( jQuery.type( elem ) === "object" ) { - // Support: QtWebKit - // jQuery.merge because push.apply(_, arraylike) throws - jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); - - // Convert non-html into a text node - } else if ( !rhtml.test( elem ) ) { - nodes.push( context.createTextNode( elem ) ); - - // Convert html into DOM nodes - } else { - tmp = tmp || fragment.appendChild( context.createElement("div") ); - - // Deserialize a standard representation - tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); - wrap = wrapMap[ tag ] || wrapMap._default; - tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[ 2 ]; - - // Descend through wrappers to the right content - j = wrap[ 0 ]; - while ( j-- ) { - tmp = tmp.lastChild; - } - - // Support: QtWebKit - // jQuery.merge because push.apply(_, arraylike) throws - jQuery.merge( nodes, tmp.childNodes ); - - // Remember the top-level container - tmp = fragment.firstChild; - - // Fixes #12346 - // Support: Webkit, IE - tmp.textContent = ""; - } - } - } - - // Remove wrapper from fragment - fragment.textContent = ""; - - i = 0; - while ( (elem = nodes[ i++ ]) ) { - - // #4087 - If origin and destination elements are the same, and this is - // that element, do not do anything - if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { - continue; - } - - contains = jQuery.contains( elem.ownerDocument, elem ); - - // Append to fragment - tmp = getAll( fragment.appendChild( elem ), "script" ); - - // Preserve script evaluation history - if ( contains ) { - setGlobalEval( tmp ); - } - - // Capture executables - if ( scripts ) { - j = 0; - while ( (elem = tmp[ j++ ]) ) { - if ( rscriptType.test( elem.type || "" ) ) { - scripts.push( elem ); - } - } - } - } - - return fragment; - }, - - cleanData: function( elems ) { - var data, elem, type, key, - special = jQuery.event.special, - i = 0; - - for ( ; (elem = elems[ i ]) !== undefined; i++ ) { - if ( jQuery.acceptData( elem ) ) { - key = elem[ data_priv.expando ]; - - if ( key && (data = data_priv.cache[ key ]) ) { - if ( data.events ) { - for ( type in data.events ) { - if ( special[ type ] ) { - jQuery.event.remove( elem, type ); - - // This is a shortcut to avoid jQuery.event.remove's overhead - } else { - jQuery.removeEvent( elem, type, data.handle ); - } - } - } - if ( data_priv.cache[ key ] ) { - // Discard any remaining `private` data - delete data_priv.cache[ key ]; - } - } - } - // Discard any remaining `user` data - delete data_user.cache[ elem[ data_user.expando ] ]; - } - } -}); - -jQuery.fn.extend({ - text: function( value ) { - return access( this, function( value ) { - return value === undefined ? - jQuery.text( this ) : - this.empty().each(function() { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - this.textContent = value; - } - }); - }, null, value, arguments.length ); - }, - - append: function() { - return this.domManip( arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.appendChild( elem ); - } - }); - }, - - prepend: function() { - return this.domManip( arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.insertBefore( elem, target.firstChild ); - } - }); - }, - - before: function() { - return this.domManip( arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this ); - } - }); - }, - - after: function() { - return this.domManip( arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this.nextSibling ); - } - }); - }, - - remove: function( selector, keepData /* Internal Use Only */ ) { - var elem, - elems = selector ? jQuery.filter( selector, this ) : this, - i = 0; - - for ( ; (elem = elems[i]) != null; i++ ) { - if ( !keepData && elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem ) ); - } - - if ( elem.parentNode ) { - if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { - setGlobalEval( getAll( elem, "script" ) ); - } - elem.parentNode.removeChild( elem ); - } - } - - return this; - }, - - empty: function() { - var elem, - i = 0; - - for ( ; (elem = this[i]) != null; i++ ) { - if ( elem.nodeType === 1 ) { - - // Prevent memory leaks - jQuery.cleanData( getAll( elem, false ) ); - - // Remove any remaining nodes - elem.textContent = ""; - } - } - - return this; - }, - - clone: function( dataAndEvents, deepDataAndEvents ) { - dataAndEvents = dataAndEvents == null ? false : dataAndEvents; - deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; - - return this.map(function() { - return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); - }); - }, - - html: function( value ) { - return access( this, function( value ) { - var elem = this[ 0 ] || {}, - i = 0, - l = this.length; - - if ( value === undefined && elem.nodeType === 1 ) { - return elem.innerHTML; - } - - // See if we can take a shortcut and just use innerHTML - if ( typeof value === "string" && !rnoInnerhtml.test( value ) && - !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { - - value = value.replace( rxhtmlTag, "<$1>" ); - - try { - for ( ; i < l; i++ ) { - elem = this[ i ] || {}; - - // Remove element nodes and prevent memory leaks - if ( elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem, false ) ); - elem.innerHTML = value; - } - } - - elem = 0; - - // If using innerHTML throws an exception, use the fallback method - } catch( e ) {} - } - - if ( elem ) { - this.empty().append( value ); - } - }, null, value, arguments.length ); - }, - - replaceWith: function() { - var arg = arguments[ 0 ]; - - // Make the changes, replacing each context element with the new content - this.domManip( arguments, function( elem ) { - arg = this.parentNode; - - jQuery.cleanData( getAll( this ) ); - - if ( arg ) { - arg.replaceChild( elem, this ); - } - }); - - // Force removal if there was no new content (e.g., from empty arguments) - return arg && (arg.length || arg.nodeType) ? this : this.remove(); - }, - - detach: function( selector ) { - return this.remove( selector, true ); - }, - - domManip: function( args, callback ) { - - // Flatten any nested arrays - args = concat.apply( [], args ); - - var fragment, first, scripts, hasScripts, node, doc, - i = 0, - l = this.length, - set = this, - iNoClone = l - 1, - value = args[ 0 ], - isFunction = jQuery.isFunction( value ); - - // We can't cloneNode fragments that contain checked, in WebKit - if ( isFunction || - ( l > 1 && typeof value === "string" && - !support.checkClone && rchecked.test( value ) ) ) { - return this.each(function( index ) { - var self = set.eq( index ); - if ( isFunction ) { - args[ 0 ] = value.call( this, index, self.html() ); - } - self.domManip( args, callback ); - }); - } - - if ( l ) { - fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this ); - first = fragment.firstChild; - - if ( fragment.childNodes.length === 1 ) { - fragment = first; - } - - if ( first ) { - scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); - hasScripts = scripts.length; - - // Use the original fragment for the last item instead of the first because it can end up - // being emptied incorrectly in certain situations (#8070). - for ( ; i < l; i++ ) { - node = fragment; - - if ( i !== iNoClone ) { - node = jQuery.clone( node, true, true ); - - // Keep references to cloned scripts for later restoration - if ( hasScripts ) { - // Support: QtWebKit - // jQuery.merge because push.apply(_, arraylike) throws - jQuery.merge( scripts, getAll( node, "script" ) ); - } - } - - callback.call( this[ i ], node, i ); - } - - if ( hasScripts ) { - doc = scripts[ scripts.length - 1 ].ownerDocument; - - // Reenable scripts - jQuery.map( scripts, restoreScript ); - - // Evaluate executable scripts on first document insertion - for ( i = 0; i < hasScripts; i++ ) { - node = scripts[ i ]; - if ( rscriptType.test( node.type || "" ) && - !data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) { - - if ( node.src ) { - // Optional AJAX dependency, but won't run scripts if not present - if ( jQuery._evalUrl ) { - jQuery._evalUrl( node.src ); - } - } else { - jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); - } - } - } - } - } - } - - return this; - } -}); - -jQuery.each({ - appendTo: "append", - prependTo: "prepend", - insertBefore: "before", - insertAfter: "after", - replaceAll: "replaceWith" -}, function( name, original ) { - jQuery.fn[ name ] = function( selector ) { - var elems, - ret = [], - insert = jQuery( selector ), - last = insert.length - 1, - i = 0; - - for ( ; i <= last; i++ ) { - elems = i === last ? this : this.clone( true ); - jQuery( insert[ i ] )[ original ]( elems ); - - // Support: QtWebKit - // .get() because push.apply(_, arraylike) throws - push.apply( ret, elems.get() ); - } - - return this.pushStack( ret ); - }; -}); - - -var iframe, - elemdisplay = {}; - -/** - * Retrieve the actual display of a element - * @param {String} name nodeName of the element - * @param {Object} doc Document object - */ -// Called only from within defaultDisplay -function actualDisplay( name, doc ) { - var style, - elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), - - // getDefaultComputedStyle might be reliably used only on attached element - display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ? - - // Use of this method is a temporary fix (more like optmization) until something better comes along, - // since it was removed from specification and supported only in FF - style.display : jQuery.css( elem[ 0 ], "display" ); - - // We don't have any data stored on the element, - // so use "detach" method as fast way to get rid of the element - elem.detach(); - - return display; -} - -/** - * Try to determine the default display value of an element - * @param {String} nodeName - */ -function defaultDisplay( nodeName ) { - var doc = document, - display = elemdisplay[ nodeName ]; - - if ( !display ) { - display = actualDisplay( nodeName, doc ); - - // If the simple way fails, read from inside an iframe - if ( display === "none" || !display ) { - - // Use the already-created iframe if possible - iframe = (iframe || jQuery( "