Skip to content

Commit

Permalink
FIX: Prerelease merge for summary css fix (#641)
Browse files Browse the repository at this point in the history 
* [LIMS-116] Fix: Summary page revamp, make css local  (#639)

* updating .gitignore

* adding frontend files and building backend

* adding front end files and router files

* create sidebar, filter options added, routes added

* add routing to page,search bar and column selector

* adding pagination continutation

* adding csv, all columns, rest of filters

* added descending and ascending

* sidebar dropdown&changed data structure&hide row

* cleaning up fixing jump bug

* refactored backend mapped data

* added expanding row

* refactored favourites

* refactored orderby filter

* cleaned up code, added comments

* added all params to watcher

* added summary db connection

* add routes to summary

* add backend changes summarypage

* changes to expandable sidebar, cleaning up fronte

* clean up, add functions to get data

* front end changes, group concat backend

* remove summarypage code

* fix pagination, timeout

* delete old summary file

* changed pagination in summary.php

* changed backend to not include tot

* fix refined cell c column

* added ifsets to avoid undefined offset error

* delete offset for output

* change order of operands

* change filters, fix operands

* fix csv button

* changed prop to propid

* format beamlinename

* change al,be,gamma

* add selected columns summary

* additional changes for selected columns

* add multiple selections change expandable sidebar

* redo  routing, keep alive summary

* fixes, change routing, results display, orderby

* fixes to selected columns

* format page to allow for customisation

* area for potential formatting and fix to querypara

* changes to regex, combobox multiple,  and fomat

* column select fix, resize pill fix, format inputs

* Update api/src/Database/DatabaseConnectionFactory.php

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/types/sp/menu.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/types/saxs/menu.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/types/pow/menu.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/types/mx/menu.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/types/em/menu.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/app/components/combo-box.vue

Co-authored-by: Guilherme Francisco <[email protected]>

* Update api/src/Database/DatabaseFactory.php

Co-authored-by: John Holt <[email protected]>

* Update api/src/TemplateParser.php

Co-authored-by: Guilherme Francisco <[email protected]>

* Code review changes: database conns, code tidy

* add get started button

* Change styling to be local rather than global

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: John Holt <[email protected]>

* [LIMS-116] Fix: Summary page revamp, delete css global (#640)

* updating .gitignore

* adding frontend files and building backend

* adding front end files and router files

* create sidebar, filter options added, routes added

* add routing to page,search bar and column selector

* adding pagination continutation

* adding csv, all columns, rest of filters

* added descending and ascending

* sidebar dropdown&changed data structure&hide row

* cleaning up fixing jump bug

* refactored backend mapped data

* added expanding row

* refactored favourites

* refactored orderby filter

* cleaned up code, added comments

* added all params to watcher

* added summary db connection

* add routes to summary

* add backend changes summarypage

* changes to expandable sidebar, cleaning up fronte

* clean up, add functions to get data

* front end changes, group concat backend

* remove summarypage code

* fix pagination, timeout

* delete old summary file

* changed pagination in summary.php

* changed backend to not include tot

* fix refined cell c column

* added ifsets to avoid undefined offset error

* delete offset for output

* change order of operands

* change filters, fix operands

* fix csv button

* changed prop to propid

* format beamlinename

* change al,be,gamma

* add selected columns summary

* additional changes for selected columns

* add multiple selections change expandable sidebar

* redo  routing, keep alive summary

* fixes, change routing, results display, orderby

* fixes to selected columns

* format page to allow for customisation

* area for potential formatting and fix to querypara

* changes to regex, combobox multiple,  and fomat

* column select fix, resize pill fix, format inputs

* Update api/src/Database/DatabaseConnectionFactory.php

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/types/sp/menu.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/types/saxs/menu.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/types/pow/menu.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/types/mx/menu.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/modules/types/em/menu.js

Co-authored-by: Guilherme Francisco <[email protected]>

* Update client/src/js/app/components/combo-box.vue

Co-authored-by: Guilherme Francisco <[email protected]>

* Update api/src/Database/DatabaseFactory.php

Co-authored-by: John Holt <[email protected]>

* Update api/src/TemplateParser.php

Co-authored-by: Guilherme Francisco <[email protected]>

* Code review changes: database conns, code tidy

* add get started button

* Change styling to be local rather than global

* delete summary css globals

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: John Holt <[email protected]>

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: John Holt <[email protected]>
  • Loading branch information
@NKatti2011 @gfrn @John-Holt-Tessella
3 people authored Jul 28, 2023
1 parent 15a7fcb commit 8415438
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion client/src/css/main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
@import "partials/_mc.scss";
@import "partials/_imaging.scss";

@import "partials/_summary.scss";



// Third-party
Expand Down
0 client/src/css/partials/_summary.scss → ...c/js/modules/summary/styles/_summary.scss
View file
File renamed without changes.
11 changes: 6 additions & 5 deletions client/src/js/modules/summary/views/summary.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<h> Filter </h>
</div>
<div class="tw-flex tw-col-span-2 tw-col-start-2 tw-mt-3 tw-ml-3">
<p class="tw-mt-2 tw-text-sm">Select Proposals </p>
<p class="tw-mt-2 tw-text-sm tw-whitespace-no-wrap">Select Proposals </p>
<combo-box v-if="filters[0].inputtype == 'combo-box'"
class="tw-w-7/12 tw-text-sm tw-ml-2 tw-mr-1 tw-mb-2"
:data="filters[0].data"
Expand All @@ -45,12 +45,12 @@
:valueArray="filters[0].selectedArr"
:searchArray="filters[0].selectedArr"
></combo-box>
<button class="sidebar-button tw-mr-1 tw-mb-2" @click="getStarted()">Get Started</button>
<button class="sidebar-button tw-mr-1 tw-mb-3 tw-whitespace-no-wrap" @click="getStarted()">Get Started</button>
</div>
<div class="tw-col-span-1 tw-col-start-6 tw-mt-2 tw-mr-3 ">
<div class="tw-col-span-1 tw-col-start-6 tw-mr-3 ">

<div class="tw-flex tw-mb-2">
<button class="sidebar-button tw-mr-1" @click="toggleSidebar()">Advanced Filter</button>
<div class="tw-flex tw-mb-3 tw-mt-3">
<button class="sidebar-button tw-mr-1 " @click="toggleSidebar()">Advanced Filter</button>
<button class="sidebar-button" @click="searchFilterParams" >
Search
</button>
Expand Down Expand Up @@ -1351,6 +1351,7 @@ export default {
</style>

<style scoped>
@import "../styles/_summary.scss";
.search-icon {
font-size: 12px;
Expand Down

0 comments on commit 8415438

Please sign in to comment.