Commit Graph

670 Commits

Author SHA1 Message Date
Konstantinos Triantafyllou bfd19dfaf3 Change description in numbers card in monitor dashboard. Fix infinite loop from last commit in error page. 2022-11-08 16:37:44 +02:00
Konstantinos Triantafyllou 7e4e6e6d46 Change position of note and fix padding in number indicators 2022-11-08 15:35:48 +02:00
Konstantinos Triantafyllou 8e978b0c9f Fix a bug in topics while delete the active entity. Fix a bug with infinity loading when a topic or category is not found. 2022-11-08 15:10:20 +02:00
Konstantinos Triantafyllou 53446ed998 Enlarge modal in edit topic/category/subcategory. Change number indicators view 2022-11-08 09:54:18 +02:00
Konstantinos Triantafyllou f7db2d03b2 Merge indicators and indicators/:topic path in one route configuration. Fix transitions in admin dashboard 2022-11-07 17:01:30 +02:00
Konstantinos Triantafyllou b970b9c302 Add new sidebar in topics component (need to investigate about transition). Add hasInternalSidebar for topics component. Move categories under topics in monitor sidebar 2022-11-04 16:36:51 +02:00
argirok fea494fd0e Merge branch 'master' of https://code-repo.d4science.org/MaDgIK/monitor-dashboard 2022-10-25 18:42:37 +03:00
Konstantinos Triantafyllou a8ab4c2e58 Fix notification message while change the status of an element and its content 2022-10-25 18:42:24 +03:00
argirok 2ad18e5899 fix related to #8135: count properly the filters applied in the parameters 2022-10-25 18:41:51 +03:00
Konstantinos Triantafyllou 191855d64d Relocate preview button from sidebar to header actions. 2022-10-24 11:31:16 +03:00
Konstantinos Triantafyllou 4060033e34 Merge from master 2022-10-23 02:15:13 +03:00
argirok ef45a417b0 make the rule to apply year filter more generic, but exclude "indi_pub_downloads_year.year" according to #8135 2022-10-17 14:22:07 +03:00
argirok 1e2a7cff85 Merge branch 'master' of code-repo.d4science.org:MaDgIK/monitor-dashboard 2022-10-17 12:44:57 +03:00
Konstantinos Triantafyllou 44427dba5f Fix change status of stakeholder and indicator. Add new APIs in development environment. 2022-10-14 14:59:36 +03:00
argirok 7347a06eea Indicator utils fixes - related to #8135
- count applied filters when the filter is applied to a field tha has a parameter filter
- apply filters in all select fields not only in the 1st
2022-10-11 10:24:34 +03:00
argirok 4d7cadbaa7 fix #8107: chart is not properly displayed because filter on field "No Of Funders" was replaced with funder name 2022-10-03 16:00:57 +03:00
argirok 1a13bd942c fix #8107: chart is not properly displayed because filter on field "No Of Funders" was replaced with funder name 2022-10-03 15:29:39 +03:00
Konstantinos Triantafyllou 371720080e Update submodules 2022-10-03 12:27:53 +03:00
Konstantinos Triantafyllou f407ecbb73 Update library before beta deployment 2022-09-28 12:19:44 +03:00
Konstantinos Triantafyllou e00fbd3ce5 Add types/ckeditor in dev dependencies 2022-09-26 18:05:13 +03:00
Konstantinos Triantafyllou d0a378158f Update submodules and fix search route configuration 2022-09-23 14:12:05 +03:00
Konstantinos Triantafyllou 612fa0ef2f Update angular core and cli to version 14 2022-09-23 13:25:18 +03:00
Konstantinos Triantafyllou 4ea92912d2 Remove renderModuleFactory (deprecated) 2022-09-23 13:18:31 +03:00
Konstantinos Triantafyllou e8f4729aba Update material to version 13 2022-09-23 12:49:43 +03:00
Konstantinos Triantafyllou c4565f4a00 Update angular core and cli to version 13 2022-09-23 12:47:58 +03:00
Konstantinos Triantafyllou cd34cac238 Update angular core and cli to version 12 2022-09-23 12:40:28 +03:00
Konstantinos Triantafyllou 9d71dc354c Update modules before update 2022-09-23 12:38:39 +03:00
Konstantinos Triantafyllou 6478a81695 Update modules before angular upgrade branch 2022-09-23 11:58:33 +03:00
Konstantinos Triantafyllou 0dc9fea22a Merge remote-tracking branch 'origin/privacy-settings' into new-theme 2022-09-21 14:43:35 +03:00
Konstantinos Triantafyllou c79ccdc25e Update modules before deployment. Remove environement condition for resources 2022-09-21 12:03:18 +03:00
Konstantinos Triantafyllou 7fc44422cf Merge remote-tracking branch 'origin/new-theme' into privacy-settings 2022-09-21 11:45:11 +03:00
Alex Martzios 301fee1246 update submodule 2022-09-21 11:38:24 +03:00
Konstantina Galouni b88667a3fd [Monitor Dashboard | new-theme]: app.component.ts: Removed deprecated RootMenuItem and used MenuItem instead. 2022-09-20 23:59:26 +03:00
Alex Martzios dde969d066 change description to note in indicators preview 2022-09-20 11:02:05 +03:00
Alex Martzios 5f3897da5a change description to note in indicators preview 2022-09-20 10:59:13 +03:00
Konstantinos Triantafyllou 5ac6847e65 Merge remote-tracking branch 'origin/new-theme' into privacy-settings 2022-09-19 17:15:27 +03:00
Alex Martzios 892253b2a1 update submodule 2022-09-19 17:08:21 +03:00
Alex Martzios 21ce37b3a5 update submodule 2022-09-19 16:48:00 +03:00
argirok c0f76eb601 fix import indicators with no numbers - create separate method to migrate from old json format. 2022-09-19 16:38:36 +03:00
Konstantinos Triantafyllou 22b22f4afa Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/monitor-dashboard into new-theme 2022-09-19 14:43:33 +03:00
Konstantinos Triantafyllou 9b494fcf5a Quick fix for import indicators 2022-09-19 14:42:59 +03:00
Alex Martzios 7daa57ada3 update submodules 2022-09-15 11:56:15 +03:00
Alex Martzios 3bfd648ee8 text changes for topics' visibility modal content 2022-09-15 11:50:24 +03:00
Alex Martzios 0a3860bb4c improve status of topics, categories, subcategories and indicators with new modal message and clickable options 2022-09-14 16:32:52 +03:00
Konstantinos Triantafyllou 4ed0890bb9 Fix a bug with active subcategory in admin 2022-09-13 13:30:16 +03:00
argirok 35e4563144 fix export indicators not in the current active subcategory 2022-09-09 13:00:39 +03:00
argirok 06959c7526 Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/monitor-dashboard into new-theme 2022-09-08 17:49:45 +03:00
argirok a3b2d58dc9 export: add section information
import: sends a list of sections to save instead of a list of indicators
2022-09-08 17:45:59 +03:00
Konstantinos Triantafyllou a9a0452632 Fix manage stakeholders loading stuck in case of session expired. 2022-09-08 16:51:10 +03:00
argirok 62dff971f3 manage indicators page add checks 2022-09-08 16:40:00 +03:00
Konstantinos Triantafyllou c1bc7b6a5a Fix a transition initilization after deleting a subcategory 2022-09-08 15:10:01 +03:00
Alex Martzios 3d6cbf8b3e add changes for fullscreen chart view on monitor component as well 2022-09-07 15:20:43 +03:00
Alex Martzios e510da08de remove 'uk-blend-multiply' from charts and add it conditionally for fullscreen view to work 2022-09-07 14:52:48 +03:00
Konstantinos Triantafyllou dc32e4c99d Update library before beta deploy 2022-08-31 13:17:01 +03:00
Konstantinos Triantafyllou 6245e80e53 Update library before beta deploy 2022-08-31 12:56:08 +03:00
Konstantinos Triantafyllou 01fbf9c3f6 Update routing of indicators pages 2022-08-29 16:58:03 +03:00
Konstantina Galouni c65174dbcd [Monitor Dashboard | new-theme]: Updated develop page and added example | Made graph and feedback line sticky in indicators' page.
1. develop.component.ts: Added example bullet for research products & Updated view of bullets (removed quotes - type bold).
2. page-content.component.ts:
   a. Added <div id="page_content_sticky_footer" #sticky_footer> and <div id="page_content_footer" #footer>.
   b. Added methods "ngAfterContentChecked()", "observeStickyFooter()", "calcStickyFooterOffset()" to calculate offset of sticky footer.
3. monitor.component.html: Added graph & feedback line as sticky_footer in >= medium screens and as footer in small screens.
2022-08-29 14:57:05 +03:00
Konstantinos Triantafyllou c65047f61d Add entities in app component in order to handle notification groups properly. 2022-08-05 15:00:21 +03:00
Alex Martzios 8ca270d48a add routing for indicator themes page and update submodules 2022-08-05 11:34:56 +03:00
Konstantinos Triantafyllou 3e1100e0ad Change back icon for manage profiles 2022-08-04 17:59:31 +03:00
Alex Martzios 170a93d108 add loading for modals: edit/create/delete topics and indicators 2022-08-04 17:45:43 +03:00
Konstantinos Triantafyllou f9dc782008 Change header info style. Fix menu in admin routes. Add replaceHeader for dashboard and stakeholder admin. 2022-08-04 15:33:49 +03:00
Alex Martzios bcbbefc277 add loading when editing/creating stakeholder profiles 2022-08-04 12:28:55 +03:00
Konstantinos Triantafyllou 48467c7172 Remove dx from doi properties and delete removed table properties 2022-08-03 21:05:07 +03:00
Konstantinos Triantafyllou adcc611fd7 Remove margin from plus at create category/subcategory 2022-08-02 23:42:38 +03:00
Konstantinos Triantafyllou ec9046569e Add some missing monitor styles. Fix monitor menu items base on home pages 2022-08-02 23:34:30 +03:00
Konstantinos Triantafyllou 71f6c494fb Update library before beta deploy 2022-08-02 23:23:48 +03:00
Konstantinos Triantafyllou 17b7d4296a Add resources menu item if environment is not production. Add placeholder in manage stakeholders 2022-08-02 23:15:38 +03:00
Konstantinos Triantafyllou 6a952b2615 Fix period filter and add filters counter 2022-08-02 10:42:23 +03:00
Konstantinos Triantafyllou bd02944e07 Disable frames load for dev, committed by mistake. 2022-07-29 14:48:43 +03:00
Konstantinos Triantafyllou 9d110a6fbf Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/monitor-dashboard into new-theme 2022-07-29 14:47:42 +03:00
Konstantinos Triantafyllou ea613919c3 Fix a bug when you are saving a topic, etc., this triggers transition. Add dev condition for resources menu item 2022-07-29 14:47:32 +03:00
Alex Martzios b49937d756 show number indicator description similar to charts 2022-07-28 16:05:26 +03:00
Konstantinos Triantafyllou 26cb6eace9 Add indicators page in stakeholder dashboard. Add resources in menu and add methodology and indicators as sub items 2022-07-27 12:36:18 +03:00
Alex Martzios f7686f2ba4 add subcategory description on top of the indicators 2022-07-26 15:24:53 +03:00
Alex Martzios 6a8637d994 update submodules 2022-07-25 15:39:43 +03:00
Konstantinos Triantafyllou e08f808564 Update library before beta deployment 2022-07-25 12:02:18 +03:00
Konstantinos Triantafyllou 5322118b42 Delete dashboard-theme 2022-07-25 11:19:53 +03:00
Konstantinos Triantafyllou f567e9d215 Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/monitor-dashboard into new-theme 2022-07-25 11:18:58 +03:00
Konstantinos Triantafyllou 555c717e21 Monitor page: Fix margins 2022-07-25 11:18:46 +03:00
Alex Martzios 5d8a3319ea rename "Search" menu item to "Browse data" + update submodules 2022-07-19 14:53:37 +03:00
Konstantinos Triantafyllou d5eff684cd Import specific less files from library instead of _import 2022-07-18 12:20:27 +03:00
Konstantinos Triantafyllou ac0d97404a Rename all component css to less. Import less from common-assets and delete deprecated.css. Remove dashboard-theme submodule 2022-07-17 16:24:47 +03:00
Konstantinos Triantafyllou 4ece9a5b60 Fix a bug with guard losing redirection. Add reorder in topics, categories, subcategories for Curators 2022-07-14 17:44:53 +03:00
Konstantinos Triantafyllou 3ffed87ad4 Topics: Add reorder functionality. Change sticky header to sticky actions in general, monitor and manage stakeholders 2022-07-14 14:38:20 +03:00
Konstantinos Triantafyllou 14a4a6e393 Update libraries for deploy 2022-07-13 16:27:46 +03:00
Konstantinos Triantafyllou 57645bd48e Update libraries before deployment 2022-07-12 11:44:37 +03:00
Konstantinos Triantafyllou 26b9b43e0a General move buttons above form 2022-07-08 21:58:14 +03:00
Konstantinos Triantafyllou a5f598d0ec Fix bug with edit stakeholder form, when enable form fields before save/ 2022-07-08 21:21:47 +03:00
Konstantinos Triantafyllou c134dc4367 Quick fix for svgs with opacity in topics 2022-07-04 23:48:11 +03:00
Konstantinos Triantafyllou eee6993f4d Delete less variables regarding dark menu and import dark parameter in navbar in dashboard pages 2022-07-04 22:35:58 +03:00
Konstantinos Triantafyllou 130926a80f Add admin menu in admin/user-info. Fix a bug initializition of menu. 2022-07-03 11:55:49 +03:00
Konstantinos Triantafyllou fbec29e2ca Remove active element from topics menu. Remove icons from edit-stakeholder and change buttons of file upload to small. Fix error page padding from top 2022-07-02 21:27:29 +03:00
Konstantinos Triantafyllou d67c19a913 Add user-info in dashboards and admin and change url to monitor in error pages. General change container-small to container 2022-06-29 14:35:21 +03:00
Alex Martzios ea80aea320 comment-out print button code 2022-06-27 17:19:56 +03:00
Konstantinos Triantafyllou 6b6e581239 Fix a bug with active menu item on sidebar. Remove openaire.css from imports 2022-06-27 15:52:14 +03:00
Konstantinos Triantafyllou fc0df9bba7 Split managers and members to seperate pages. Apply multiply filter to all logos in page content header. 2022-06-26 23:42:30 +03:00
Konstantinos Triantafyllou 5ff31cf4ff Delete material.scss and import from library. Add placeholder logo in all pages if logo doesn't exist 2022-06-24 18:22:55 +03:00
Konstantinos Triantafyllou 0c3c3b408b Fix bug with dropdown after dragging event ends 2022-06-21 14:39:27 +03:00
Konstantinos Triantafyllou d4649fb3c0 Change modal header background for dashboard pages 2022-06-21 13:53:25 +03:00
Alex Martzios d4baa76954 update submodules 2022-06-21 12:22:43 +03:00
Konstantinos Triantafyllou cc2c9de1f1 Utilize conditions regarding sidebar visibillity 2022-06-20 16:55:45 +03:00
Konstantinos Triantafyllou 586e8359a5 Fix modal heights for all dashboard pages 2022-06-20 16:25:00 +03:00
Konstantinos Triantafyllou 619ed39e66 Add modal container and fix secondary button style 2022-06-20 13:30:25 +03:00
Konstantinos Triantafyllou 64f5ede63c Add deprecated.css to import library.css and dashboard-theme. 2022-06-17 15:26:25 +03:00
Konstantinos Triantafyllou 23c3c34bb1 Remove add stakeholder page at body. Remove flip from dropdown in indicators, categories and subcategories. 2022-06-17 02:59:24 +03:00
Konstantinos Triantafyllou 51b46a684c Change from css to less 2022-06-16 19:54:14 +03:00
Konstantina Galouni b89565139f [Monitor Dashboard | new-theme]: methodology.component.ts & monitor.component.html: Use class="text-graph" instead of "graph" for graph color. 2022-06-15 10:57:57 +03:00
Alex Martzios ae3ff6f9f2 add stakeholder entities as enum and update openaireLibrary repo 2022-06-09 10:38:45 +03:00
argirok bd8032fdb5 remove metricsAPIURL property 2022-06-08 14:56:47 +03:00
Konstantinos Triantafyllou 1cc8220e53 Remove Contact us from menu if monitor selected 2022-06-08 14:20:45 +03:00
Konstantinos Triantafyllou 2c5c604902 Update openaire-theme before creating a branch 2022-06-08 13:24:11 +03:00
Konstantinos Triantafyllou 0ec44320c5 Restrict Edit Delete actions only to admins and curators 2022-06-06 17:17:26 +03:00
Konstantinos Triantafyllou bd63de452b Enable fullscreen for iframes. Fix copy to clipboard for links in indicators form. 2022-06-06 16:36:23 +03:00
Konstantinos Triantafyllou d71bd112c8 Comment out filters applied. Update libraries 2022-05-27 12:30:01 +03:00
Konstantinos Triantafyllou de5874e334 Add property errorLink in navigation to error 2022-05-11 12:57:00 +03:00
Alex Martzios bbfdaea444 tweaks for print.css 2022-05-11 11:26:40 +03:00
Alex Martzios 1b3e011924 add link variables for dev properties as well 2022-05-10 12:59:41 +03:00
Alex Martzios 742b1e46cc change link value for env properties(beta and prod), update openaireLibrary repo 2022-05-10 12:44:48 +03:00
Alex Martzios 147ca8bb64 print report tweaks 2022-05-09 13:15:37 +03:00
Konstantina Galouni d2a9b45b53 [Monitor Dashboard & Library | new-theme]: Renaming entity types using OpenaireEntities.
Files updated: develop.component.ts, methodology.component.ts,  claimEntitiesSelection.component.ts, directLinking.component.ts, linkingGeneric.component.html, linkingGeneric.component.ts, approved.component.ts, searchDataprovidersToDeposit.component.ts, errorPage.component.ts, dataProvider.component.html, dataProvider.component.ts, dataProvider.service.ts, relatedDatasourcesTab.component.ts, project.component.ts, myOrcidLinks.component.ts, searchMyOrcidResults.component.html, searchMyOrcidResults.component.ts, searchAll.component.html, searchAll.component.ts, advancedSearchForm.component.html, advancedSearchForm.component.ts, searchDataProviders.component.ts, searchResearchResults.service.ts, numbers.component.ts, other-portals.component.html, other-portals.component.ts, fetchDataproviders.class.ts, fetchResearchResults.class.ts, searchFields.ts, result-preview.component.ts
2022-05-09 13:13:44 +03:00
Konstantina Galouni 13c2576272 [Library | new-theme]: In landing pages, title & tabs sticky even when bottom is in viewport | Other versions modals title updated | DMPs tab updated.
1. dataProvider.component.html & project.component.html & resultLanding.component.html: Removed "shouldSticky" check from id="main-tabs-div" - title & tabs sticky even when bottom is in viewport.
2. dataProvider.component.ts & organization.component.ts & project.component.ts & resultLanding.component.ts: Commented shouldSticky and observer for bottom - title & tabs sticky even when bottom is in viewport.
3. organization.component.ts & resultLanding.component.ts: In modal for other versions, title updated without "of".
4. project.component.html: In <search-tab> for DMPs added resultType="DMPs" | Title in DMPs tab changed to Data Management Plans.
5. search-tab.component.ts: Moved <errorMessages> after tab title and <ng-content> | In method "getEntityName()" return "this.resultType" if exists and no other condition matches.
2022-05-06 16:31:40 +03:00
Alex Martzios 8d7887c2aa add placeholder img 2022-05-06 16:26:19 +03:00
Konstantina Galouni d78b65d36c [Library | new-theme]: searchFilter.component.html: [Bug fix] Re-added (valueChange)="sort()" on sort by input | searchFilter.component.ts: Remove parameter from sort() method (not needed). 2022-05-06 13:44:59 +03:00
Konstantinos Triantafyllou 0f1cc6a0f7 Fix a bug with in slider of selected filters, when it is an empty list 2022-05-06 13:00:24 +03:00
Konstantinos Triantafyllou fdfcfbafdd Fix slider container with offset to avoid hide information in selected filters 2022-05-06 11:34:44 +03:00
Konstantinos Triantafyllou 24fdc9d15f Change position of stakeholderPage class to body 2022-05-05 21:43:28 +03:00
Konstantinos Triantafyllou e279e02c66 Update link to research graph in methodology 2022-05-05 21:17:32 +03:00
Konstantinos Triantafyllou c9499ea0a6 Remove some console logs. Fix selected filters alignment 2022-05-05 17:18:58 +03:00
argirok 6fe8b482d9 Merge branch 'new-theme' of https://code-repo.d4science.org/MaDgIK/monitor-dashboard into new-theme 2022-05-05 11:41:14 +03:00
argirok df2a6c09f0 fix in export indicators (change variable to numbers) 2022-05-05 11:40:13 +03:00
Konstantina Galouni 8e644c47e0 [Monitor Dashboard | new-theme]: environments/: Added "fairSharingURL" and "eoscMarketplaceURL". 2022-05-03 14:29:30 +03:00
argirok e70dc8a586 indicators selected filters in one row slider 2022-04-21 16:25:05 +03:00
Konstantinos Triantafyllou eeeb4df8d1 Add uk-active in selected visibillity 2022-04-20 13:58:32 +03:00
Konstantinos Triantafyllou 3a34383931 Update some variables base on new theme update 2022-04-19 00:12:48 +03:00
Konstantinos Triantafyllou 8c76b808d9 1. Change selected fitlers in monitor base on filters in search. 2. Add label secondary with color of monitor 2022-04-18 14:44:44 +03:00
Konstantinos Triantafyllou 156e069c08 Monitor page: change close link to button in description modal 2022-04-17 15:26:31 +03:00
Konstantinos Triantafyllou 6e99d71ae2 Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/monitor-dashboard into new-theme 2022-04-15 15:40:24 +03:00
Konstantinos Triantafyllou a19b82709a Add searchForm with light background in all search pages. Add uk-nav in topics list in indicatos pages. Fix some links that should not be undelines in hover 2022-04-15 15:40:12 +03:00
Alex Martzios 3c37e590a2 minor tweaks for print.css 2022-04-15 13:57:55 +03:00
Konstantinos Triantafyllou ba3f5b6a7a Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/monitor-dashboard into new-theme 2022-04-14 12:51:43 +03:00
Konstantinos Triantafyllou 2e1355d0e8 Rename uk-text-primary-gradient to uk-text-background. Remove flip: false in manage stakeholders 2022-04-14 12:51:31 +03:00
Alex Martzios 7f10763816 add content for methodology page (new-theme only) 2022-04-14 10:48:59 +03:00
Alex Martzios e50c4c7bef content changes for methodology page 2022-04-14 10:21:01 +03:00
Konstantinos Triantafyllou 51eed6d164 Update library 2022-04-13 14:20:58 +03:00
Konstantinos Triantafyllou 01b5d26b62 Fix a bug in guard regarding deprecated method isLoggedIn 2022-04-13 13:51:25 +03:00
Alex Martzios 56a877461d tweak for print.css and add click-outside-or-escape directive for indicators' description overlay 2022-04-13 13:22:22 +03:00
Konstantinos Triantafyllou da71702e2a Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/monitor-dashboard into new-theme 2022-04-12 17:23:25 +03:00
Konstantinos Triantafyllou 67da43e1dd Add queryParamsHandling = merge for dashboard-sidebar 2022-04-12 17:23:13 +03:00
Alex Martzios f9c5aa616d update methodology page content, new css rules for printing, new description for indicators 2022-04-12 13:03:47 +03:00