Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Set filter pill custom blade #33

Merged
merged 2 commits into from
Mar 18, 2023
Merged

Set filter pill custom blade #33

merged 2 commits into from
Mar 18, 2023

Conversation

lrljoe
Copy link
Member

@lrljoe lrljoe commented Mar 18, 2023

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?

New Feature Submissions:

  1. Does your submission pass tests and did you add any new tests needed for your feature?
  2. Did you update all templates (if applicable)?
  3. Did you add the relevant documentation (if applicable)?
  4. Did you test locally to make sure your feature works as intended?

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?
  • Have you successfully ran tests with your changes locally?

@lrljoe lrljoe merged commit b94751d into FiltersCombined Mar 18, 2023
lrljoe added a commit that referenced this pull request Mar 30, 2023
@lrljoe
Filters combined final (rappasoft#1129)
58fa1b1 
* Restrict AppliedFilters to only return non-empty

At the moment, a filter will be considered "applied" if it has any value, including the default value.  This causes the Pills to appear with a blank value.

* Moving to withValues to make more sense

* Initial Commit

* Add variable to Filter.php

* Filter LabelID (#32)

* Amended to removing formatting adjustments

Adding ID to Label

Update toolbar.blade.php

Adding new line at EOF

* Update toolbar.blade.php

Adding ID to Wrapper

* Amended to removing formatting adjustments

Adding ID to Label

Adding ID to Wrapper

Adding new line at EOF

Update toolbar.blade.php

Adding ID to Wrapper

* Update toolbar.blade.php

Adds IDs to Filter Labels
Adds IDs to Filter Wrappers
Restores removed EOF newline

* Restoring New Line at EOF

* Child open attribute (#35)

* Adding childElementOpen attr for all toolbar items.

* Adjusting Toolbar to remove errant formatting

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Set filter pill custom blade (#33)

* Initial Commit

* Add variable to Filter.php

* Get applied filters   only non empty (#34)

* Restrict AppliedFilters to only return non-empty

At the moment, a filter will be considered "applied" if it has any value, including the default value.  This causes the Pills to appear with a blank value.

* Moving to withValues to make more sense

* Set filter row colspan (#36)

* Adding Custom Slug option (#21)

Adding new methods & test

Adding documentation

* Filter label (#22)

* Amended to removing formatting adjustments

Adding ID to Label

Update toolbar.blade.php

Adding new line at EOF

* Update toolbar.blade.php

Adding ID to Wrapper

* Amended to removing formatting adjustments

Adding ID to Label

Adding ID to Wrapper

Adding new line at EOF

Update toolbar.blade.php

Adding ID to Wrapper

* Update toolbar.blade.php

Adds IDs to Filter Labels
Adds IDs to Filter Wrappers
Restores removed EOF newline

* Restoring New Line at EOF

* Adding Filter Custom Pills blade option (#23)

* Adding Filter Custom Pills blade option

* Removing formatting changes

* Get applied filters   only non empty (#24)

* Restrict AppliedFilters to only return non-empty

At the moment, a filter will be considered "applied" if it has any value, including the default value.  This causes the Pills to appear with a blank value.

* Moving to withValues to make more sense

* Child open attribute (#25)

* Adding childElementOpen attr for all toolbar items.

* Adjusting Toolbar to remove errant formatting

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Adding getAdditionalSelectRaws (#26)

Using selectRaw rather than directly using DB

Referencing DB directly rather than a use

Fix styling

Fixing test

Restoring workflows

Removing automated on-push

Setting up configuration elements, documentation

Adding parameterised capability

* Update composer.json

* Update run-tests.yml

* Fix doc types (#27)

* Update toolbar.blade.php

* Update Filter.php

* Update FilterHelpers.php

* Fix styling

* Update FilterConfiguration.php

* Fix styling

* Initial DocType Fixes

* Fix styling

* PHPDoc FIxes

* Toolbar Blade Fixes for Pagination

* Fix styling

* Removing non-nullable return

* Fixing DocType issues

* Reverting minor tweaks due to PHPUnit failures

* Removing PHPStan

* Additional PHPDoc Fixes

* Fixes for PHPDocTypes

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Update composer.json

* Custom pill views (#29)

* Adding Filter Custom Pills blade option

* Removing formatting changes

* Initial Commit

* Fix styling

* Fix for errant line end

* Fix styling

* Minor Tweaks

* Remove ParaTest for this branch

* Restore Run-tests for this branch

* Remove CustomFilterPil

* Reverting Numerous Changes to Doctypes - Branches

* Fix Mistaken Branch merge

* More remediation to remove branch merges

* Fix styling

* More removals of branch merge

* Adding SlideDownRow and SlideDownColspan Tests

* Fix styling

* Restoring original workflow

* Restoring CS FIxer

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Adding test for get/set custom pills

* Fix styling

* Update Test

* Initial Commit add filterPosition to header/footer

* Fix styling

* Move Labels to Blades & CustomFilterLabels

* Move Labels to Blades & CustomFilterLabels

* Fix styling

* Add swapping for slidedown/popover for BS4/5

* Fix styling

* Custom filter labels (#39)

* Move Labels to Blades & CustomFilterLabels

* Move Labels to Blades & CustomFilterLabels

* Fix styling

* Add swapping for slidedown/popover for BS4/5

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Fix styling

* Extra Tests

* Fix styling

* Removing duplicate method

* Fix styling

* Test Fixes - TypeHinting

* Remove Protected Property

* Property Fixes

* Row/Colspan - move to string|int

* Doc Updates

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
lrljoe added a commit that referenced this pull request Apr 15, 2023
@lrljoe @shiv122
@macbookandrew @rappasoft @CristhoferMF @SamanthaBainCornu
Develop (#58)
a832b43 
* Added eager loading option

* strongly typed relationship variable

* Adding childElementOpen attr for all toolbar items.

* Adjusting Toolbar to remove errant formatting

* Fix styling

* Adding Custom Slug option

Adding new methods & test

Adding documentation

* improve active page visibility

* Update run-tests.yml

Update run-tests.yml

Fixing typo in class name

Update composer.json

Update run-tests.yml

* Update run-tests.yml

* Update run-tests.yml

* Changelog

* Update es.json

* Changelog

* Alphabetising and Adding Missing Translations

Adding row language option

Remove PHPUnit 10

Add coverage cache

Restore usage of pcov

Update for PHPUnit 10

WF Updates

Move Problem Matchers

Merge Push Tests

Test WF

Merge WF

Restoring PHPUnit

Revert WF & Composer Changes

Adding row to remaining languages

Adding row to remaining languages

* Workflow Tweaks - Removing Separate CS-Fixer

Run-Tests now runs in the following order
- First run PHP CS Fixer (on PUSH ONLY)
- Next run the matrix

This removes the potential for CS Fixer to make changes to the codebase after tests have commenced.

* Restoring CSFixer Badge Capability

* Update CHANGELOG.md

* Update CHANGELOG.md

* Filters combined final (rappasoft#1129)

* Restrict AppliedFilters to only return non-empty

At the moment, a filter will be considered "applied" if it has any value, including the default value.  This causes the Pills to appear with a blank value.

* Moving to withValues to make more sense

* Initial Commit

* Add variable to Filter.php

* Filter LabelID (#32)

* Amended to removing formatting adjustments

Adding ID to Label

Update toolbar.blade.php

Adding new line at EOF

* Update toolbar.blade.php

Adding ID to Wrapper

* Amended to removing formatting adjustments

Adding ID to Label

Adding ID to Wrapper

Adding new line at EOF

Update toolbar.blade.php

Adding ID to Wrapper

* Update toolbar.blade.php

Adds IDs to Filter Labels
Adds IDs to Filter Wrappers
Restores removed EOF newline

* Restoring New Line at EOF

* Child open attribute (#35)

* Adding childElementOpen attr for all toolbar items.

* Adjusting Toolbar to remove errant formatting

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Set filter pill custom blade (#33)

* Initial Commit

* Add variable to Filter.php

* Get applied filters   only non empty (#34)

* Restrict AppliedFilters to only return non-empty

At the moment, a filter will be considered "applied" if it has any value, including the default value.  This causes the Pills to appear with a blank value.

* Moving to withValues to make more sense

* Set filter row colspan (#36)

* Adding Custom Slug option (#21)

Adding new methods & test

Adding documentation

* Filter label (#22)

* Amended to removing formatting adjustments

Adding ID to Label

Update toolbar.blade.php

Adding new line at EOF

* Update toolbar.blade.php

Adding ID to Wrapper

* Amended to removing formatting adjustments

Adding ID to Label

Adding ID to Wrapper

Adding new line at EOF

Update toolbar.blade.php

Adding ID to Wrapper

* Update toolbar.blade.php

Adds IDs to Filter Labels
Adds IDs to Filter Wrappers
Restores removed EOF newline

* Restoring New Line at EOF

* Adding Filter Custom Pills blade option (#23)

* Adding Filter Custom Pills blade option

* Removing formatting changes

* Get applied filters   only non empty (#24)

* Restrict AppliedFilters to only return non-empty

At the moment, a filter will be considered "applied" if it has any value, including the default value.  This causes the Pills to appear with a blank value.

* Moving to withValues to make more sense

* Child open attribute (#25)

* Adding childElementOpen attr for all toolbar items.

* Adjusting Toolbar to remove errant formatting

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Adding getAdditionalSelectRaws (#26)

Using selectRaw rather than directly using DB

Referencing DB directly rather than a use

Fix styling

Fixing test

Restoring workflows

Removing automated on-push

Setting up configuration elements, documentation

Adding parameterised capability

* Update composer.json

* Update run-tests.yml

* Fix doc types (#27)

* Update toolbar.blade.php

* Update Filter.php

* Update FilterHelpers.php

* Fix styling

* Update FilterConfiguration.php

* Fix styling

* Initial DocType Fixes

* Fix styling

* PHPDoc FIxes

* Toolbar Blade Fixes for Pagination

* Fix styling

* Removing non-nullable return

* Fixing DocType issues

* Reverting minor tweaks due to PHPUnit failures

* Removing PHPStan

* Additional PHPDoc Fixes

* Fixes for PHPDocTypes

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Update composer.json

* Custom pill views (#29)

* Adding Filter Custom Pills blade option

* Removing formatting changes

* Initial Commit

* Fix styling

* Fix for errant line end

* Fix styling

* Minor Tweaks

* Remove ParaTest for this branch

* Restore Run-tests for this branch

* Remove CustomFilterPil

* Reverting Numerous Changes to Doctypes - Branches

* Fix Mistaken Branch merge

* More remediation to remove branch merges

* Fix styling

* More removals of branch merge

* Adding SlideDownRow and SlideDownColspan Tests

* Fix styling

* Restoring original workflow

* Restoring CS FIxer

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Adding test for get/set custom pills

* Fix styling

* Update Test

* Initial Commit add filterPosition to header/footer

* Fix styling

* Move Labels to Blades & CustomFilterLabels

* Move Labels to Blades & CustomFilterLabels

* Fix styling

* Add swapping for slidedown/popover for BS4/5

* Fix styling

* Custom filter labels (#39)

* Move Labels to Blades & CustomFilterLabels

* Move Labels to Blades & CustomFilterLabels

* Fix styling

* Add swapping for slidedown/popover for BS4/5

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Fix styling

* Extra Tests

* Fix styling

* Removing duplicate method

* Fix styling

* Test Fixes - TypeHinting

* Remove Protected Property

* Property Fixes

* Row/Colspan - move to string|int

* Doc Updates

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* ChangeLog Updates (rappasoft#1131)

* Doc updates (rappasoft#1132)

* ChangeLog Updates

* Adding additional changes

* Doc type fixes (rappasoft#1133)

* Trait Configuration/Helpers

* Fix styling
* PHPStan
* Remove dynamic property dataTableFingerprint
* Fix styling
* DocType Fixes
* Merge branch 'docTypeFixes'
* TypeHint Fixes
* Fix styling
* Fix int/string refreshTime
* PHPStan Fixes
* Broken Footer/Header Methods
* Update gitattributes
* PHPStan-L3-Minimum

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Update Changelog (rappasoft#1134)

* Correcting confusing format() documentation (rappasoft#1135)

* Pagination updates (rappasoft#1136)

* Pagination Updates
* Updating ChangeLog

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Additional Tests - Expansion on PetsTable (rappasoft#1137)

* Additional Tests

* DB Switching

* Workflow Tweaks

* Fix styling


---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Changelog

* 212fixes (rappasoft#1146)

* Fix styling

* Change Cache Name - Test

* Change Fail Fast to False

* Revert CS Fixer

* Restore Collision Versioning

* Restore test adjustments

* Fix styling

* Revert errant change to ColumnHelpers Test

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* 212fixes (rappasoft#1147)

* Fix styling

* Change Cache Name - Test

* Change Fail Fast to False

* Revert CS Fixer

* Restore Collision Versioning

* Restore test adjustments

* Fix styling

* Revert errant change to ColumnHelpers Test

* Add Cache Clearing & Cache to Array

* Remove Artisan reference

* Disable View Cache for Tests

* Split Push/Pull Jobs

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* V212 fixes (rappasoft#1148)

* Test Fixes

* Fix styling\n\nskip-checks:true

* Clean up CSFixer

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>

* Fixing Per 1139 (rappasoft#1149)

* fixed multiSelectDropdownFilter in menus (rappasoft#1162)

deleted a </div> at the end of file

Co-authored-by: Anthony Rappa <rappa819@gmail.com>
Co-authored-by: SamanthaBainCornu <104172362+SamanthaBainCornu@users.noreply.github.com>

---------

Co-authored-by: shiv122 <37039611+shiv122@users.noreply.github.com>
Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
Co-authored-by: Andrew Minion <andrew@andrewrminion.com>
Co-authored-by: Anthony Rappa <rappa819@gmail.com>
Co-authored-by: Cristhofer Montalvo <cristhofermontalvo@gmail.com>
Co-authored-by: SamanthaBainCornu <104172362+SamanthaBainCornu@users.noreply.github.com>
lrljoe added a commit that referenced this pull request Aug 26, 2023
@lrljoe
Merge pull request #33 from LowerRockLabs/joedev
24cc079 
Search Placeholder & Flatpickr Adjustments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@lrljoe