Commit graph

406 commits

Author SHA1 Message Date
bkoniden
970c686dc0 NIHVIVO-1986 -- The blank screen problem is resolved for present. But the more general problems NIHVIVO-1659 and NIHVIVO-1686 have to be addressed for a complete solution. 2011-02-03 18:42:32 +00:00
cdtank
49116a20b2 1. Changed wordings for CSV file downloads & Network Image files for co-author & co-investigator networks.
2. Changed Temporal Graph legend links to be save as other clickable links (blue-ish)
3. Changed wordings on temporal graph vis.
4. Changed default sorting to be first on counts (desc) & then entity names (asc)
5. Changed how the constants were intiated for temporal vis, this is preparation for other tasks.
6. Since now if no URI is provided to the tmeporal graph vis it defaults to the highest levbel org. Removed the AJAX call to a utilites servlet that calculated this beforehand.
2011-02-02 21:04:36 +00:00
bkoniden
b1f72c276f NIHVIVO-1681 -- Made changes to EntityPubCountRequestHandler for graceful degradation of the vis incase the highest level org contains no pubs/grants. 2011-02-02 18:22:39 +00:00
bkoniden
fb263e3178 Refactoring names of startdates in QueryFieldLabels.java 2011-01-31 19:35:58 +00:00
bkoniden
98231b0ce3 NIHVIVO-1940
- Modified the grant queries to use role's dateTime as a general rule and default to grant's dateTime when role's dateTime is not available.
2011-01-31 19:18:51 +00:00
bkoniden
d039a74929 Making the change addressing NIHVIVO-1940 to Temporal Graph too. 2011-01-28 15:02:01 +00:00
bkoniden
bf715d7425 NIHVIVO-1940
1) Fixing the queries to retrieve date/time information from the role and not from the grant.
2011-01-28 14:54:17 +00:00
bkoniden
cfe93b5142 NIHVIVO-1681
1) Committing changes to EntityPublicationCountRequestHandler to retrieve the highest level org on no uri parameter in the URL.
2011-01-27 22:18:53 +00:00
bkoniden
797c1fa2f7 NIHVIVO-1731
2) Removed redundant code from Grants.java -- fields such as year, yearMonth that are irrelevant now
2011-01-27 19:22:41 +00:00
bkoniden
9c72c0af02 NIHVIVO-1731
1) Modified body foe getParsedGrantStartYear(). -- Previously, it used custom logic for parsing the year value of a Date string. Now, it uses jodatime library's utilities to parse year values.
2) Removed redundant code from UtilityFunctions.java -- pertaining to grantUtility functions.
2011-01-27 19:15:36 +00:00
cdtank
b65c2bccbe 1. Changes to fix the bug in display of years attached to publications. (see NIHVIVO-1794) It was caused due to change in Date/Time format representation in the backend.
2. Added code so new date/time formatters can be added with ease.
2011-01-27 18:21:02 +00:00
cdtank
1f7962a454 1. Made style changes to the temporal graph vis per Katy's suggestions.
2. Refactored the temporal graph views (based on different comparison parameters). Now there is one basic template from which different parameter templates inherit.
3. Did code cleanup for the same.
4. Removed GUI related javascript into separate file & include it in the common basic template for temporal graph vis.
5. Reflected the changes in the servlets as well.
2011-01-25 00:55:47 +00:00
cdtank
c5709c2c74 1. Fix for the bug NIHVIVO-1775 essentially not displaying collaboratorship links (co-authorship or co-piship) if there are no publications (or grants) for that individual. The affected pages are foaf:Person profile page, co-authorship & co-piship pages for a foaf:Person. 2011-01-20 22:49:56 +00:00
bkoniden
0c50024664 Fixing minor syntax error in copigrant query. 2011-01-20 21:47:08 +00:00
bkoniden
2f26db2b7f Commenting out sys.out statements. 2011-01-20 18:46:16 +00:00
bkoniden
628d7615f3 Resolving the following:
(NIH-1804) Do investigator grants show up in visualizations of just principal-investigator?
(NIH - 1826) Make sparql queries for Grants related visualizations compliant to 1.2 for the date property

Made changes to the grant queries to include core:dateTime property.
2011-01-20 18:44:13 +00:00
bkoniden
239b6d40d7 NIVIVO - 1732 For temporal graph vis if an organization does not have any publications then there is no option to switch to "by Grants" mode 2011-01-19 21:45:43 +00:00
cdtank
f6429af187 1. Made changes so that publication related visualization queries respect the 1.2 ontology's date proeprties & also pre-1.2 onotology data. It first attempts to get date using new property, failing which it sees if date is present in old property & proceeds accordingly.
2. Refactored code for temporal graph vis. Fixed couple of bugs in it.
2011-01-19 20:23:22 +00:00
bkoniden
c73cb28426 The queries for TemporalGraph, CoPI and PersonGrantCount (individual sparkline for grants) now include core:hasInvestigatorRole and core:investigatorRoleOf while calculating the total number of grants. 2011-01-19 20:11:39 +00:00
bkoniden
51f108547a 1) Created a ftl for displaying Temporal vis Grants.
2) Made changes to util.js to reflect the state (grants or pubs)
2011-01-14 17:56:56 +00:00
cdtank
72feb61f5f 1. Made change so that first deploy.proeprties file is looked for a valid URI for highest level organization in (visualization.topLevelOrg) & if found & valid, this will be used in the temporal graph vis for top level org. 2011-01-13 00:25:00 +00:00
bkoniden
9971e5fa2b Committing the following changes
1) Handling Null pointer Exceptions for EntityPubCount, EntityGrantCount and EntitySubOrganizationTypes
2) Removing the dependency on vis_mode parameter in the server side code. The class the individual belongs to is retrieved using vitroRequest.getWebappDaoFactory().getIndividualDao().getIndividualByURI(IndividualURI).isVClass(ClassURI)
3) On the client side, the vis_mode parameter is set(from the value passed on by the requesthandler) to differentiate between personURL and SubOrganizationTemporalGraphURL on drill down.
4) Added entityComparisonErrorActivator.ftl to handle edge cases (if the resultset of the queries is NULL)
2011-01-12 23:16:30 +00:00
cdtank
c7b9c208ef 1. Made changes to the URLs in the repository to use /visualization instead of /visualizationfm 2011-01-12 19:59:20 +00:00
cdtank
fecd8d938d 1. Attempting to delete old visualization back-end & front-end 2011-01-12 19:29:37 +00:00
cdtank
3b8ac290a7 1. Attempting to delete old visualization back-end & front-end 2011-01-12 19:29:03 +00:00
cdtank
08e643982a 1. Attempting to delete old visualization back-end & front-end 2011-01-12 19:28:21 +00:00
cdtank
dea26c9527 1. Cleaned up paths in the freemarker templates to not refer old visualization urls.
2. Changed web.xml url-pattern mapping from old visualization servlet TO freemarkerized version.
3. Updated style for temporal graph vis.
4. Changed freemarkerized code snippets to not refer old visualization servlets.
2011-01-12 17:18:16 +00:00
cdtank
3d8f5d921c 1. Added temporal graph link for the highest organization code for "organizations" page.
2. Cleaned up some query runners.
3. Made GenericQueryRunner to accept sparql queries that does not depend on URIs.
4. Adde style for temporal graph link to wilma.css
2011-01-10 23:48:47 +00:00
cdtank
3cd9016715 1. Fixed the notification bug in temporal graph vis for IE. 2011-01-08 00:03:26 +00:00
bkoniden
a740497bb6 Committing the following changes
1) Added entry for entity_grant_count in visualizations-beans-injection-fm.xml
2) Styling changes in layout.css -- changed the styling for buttons.
3) util.js -- Removed hardcoding of URLs see NIH VIVO 1618 and 1619
4) Made queries for EntityGrantCount, EntityPubCount and EntitySubOrganizationTypes more generic. Added Export as CSV functionailty for EntityGrantCount
2011-01-07 21:59:59 +00:00
bkoniden
d55a3380d3 1) Added the freemarker version of EntityPublicationCount backend (RequestHandler, 2 QueryRunners)
2) Added the ftl version of entity_comparison.jsp (entityComparisonStandaloneActivator.ftl)
2011-01-05 16:23:53 +00:00
bkoniden
c74821f302 A bunch of changes like
1) Freemarker versions of Co-PI visualizations. CoInvestigator.ftl, CoPIPersonLevel.ftl, person_level_fm-copi.js.
2) Styling changes to Temporal graph.
3) Adding co_author, co_pi and temporal graph icons.
4) ftls related to sparklines. (CoAuthorship and CoPI)
5) Styling changes to CoAuthor/CoPI visualizations -- page.css, coauthor_style.css, coinvestigator_style.css
2011-01-03 22:47:34 +00:00
cdtank
7568601dc4 1. Modified javascript for person level page to adapt tp freemarker changes.
2. Abstracted out the table generating code for sparklines out. This gives us flexibility to put the table wherever we want in the template.
3. Made changes to coauth person l;evel page to display all the content. TThe data is all there with links.
4. Adapted person pub count & coauth sparklines to adapt to new table generating template.
5. Changed coauth vis code gen to include a missing data value.
6. Fixed a bug in person level req handler.
2010-12-23 23:55:57 +00:00
cdtank
419c9dbfb5 1. Modified dependency injection bean to use proper packages.
2. Started the bifurcation process of person level into coauthor person level & copi person level.
3. Fixed person pub count sparkline to use new data structures.
4. Modified co athor vis code genrator to save some more data for use by the templates.
2010-12-23 16:51:03 +00:00
bdc34
ba13a71e3e Working on dateTime with precision NIHVIVO-295 2010-12-22 22:36:47 +00:00
bkoniden
5a4d336077 1) Modified CoPIGrantCountRequestHandler that handles four data responses -- 2 sparkline, 2 data 2010-12-22 22:07:04 +00:00
cdtank
d0aa00d216 1. Added VOs to be consumed by the templates. 2010-12-22 21:18:19 +00:00
cdtank
d08cdd3498 1. Modified dependency injection bean to include the new freemarkerized vis.
2. Modified freemarker branch to use newly added visFramework constants.
3. Completed freemarkerization of co-pi vis code generator.
4. Modified co-autho req handler to handle all data responses (2 sparkline, 2 network) instaed of person level.
5. Adde dperson level request handler to freemarker branch.
2010-12-22 21:14:07 +00:00
bkoniden
af69cb0c51 1)Committing ftls for persongrantcount and co-pi.
2)Modified {standalone,dynamic} activator for coauthor, personpubcount,persongrantcount and copi. -- fixed the path 
3)Modified persongrantcountrequesthandler -- fixed the path
2010-12-22 17:01:26 +00:00
rjy7
3730aecb6f Added getTitle() method to EmptyController. Requires changing method signature to take a VitroRequest object. 2010-12-22 16:52:37 +00:00
cdtank
2404668a0d 1. Made changes to freemarker temnplate paths in the servlets.
2. Removed redundant templates.
2010-12-22 16:38:57 +00:00
bkoniden
12ddea8241 Adding coInvestigation.ftl and modified CoPIGrantCountRequestHandler 2010-12-22 14:44:39 +00:00
cdtank
a3aa585a03 1. Refactored freemarker templates & the directory structure.
2. Made chanegs to sparkline-related ftls to use the new geenric vis code geenrator.
3. Refactored vis code geenrators to be more geenric.
2010-12-22 01:00:47 +00:00
bkoniden
7dc4628302 Made the following changes:
1) Rewrote queries for CoPIGrantCount and PersonGrantCount -- Fixed a major bug
2) lots of styling changes to coauthor_style.css and page.css and couple of changes to person_level.jsp to incorporate new changes from Elisha's mockup.
3) Increased the width of sparklines to 150px. The text surrounding the sparklines needs to be further styled.
2010-12-22 00:44:02 +00:00
nac26
4c6ae87390 NIHVIVO-1381 Updated name of template file to match naming convention throughout app (start with lowercase) 2010-12-21 22:37:27 +00:00
cdtank
81855eddc2 1. Removed SOPs from the visualization codebase. Switched it with log.debugs.
2. Added person grant count & coauthorship to the freemarker version of dependency inhection bean.
3. Fixed a bug in garnt count freemarker.
4. Made use of urlbuilder instead of making urls by just encoding/appending parameters.
5. Add co-pi to the freemarker package. Completed the back-end conversion.
2010-12-17 22:05:53 +00:00
cdtank
36a5f5ad0c 1. Converted co-authorship to use the new vis arhitecture & freemarker. 2010-12-17 16:46:05 +00:00
jeb228
a476a47418 Add license tags where required. 2010-12-16 20:57:57 +00:00
cdtank
06523d402e 1. Changed vis architecture to serve 3 type of responses from 3 corresponding url patterns (standard, ajax, data).
2. Removed debug statements from publication sparkline ftl.
3. Reworked publication sparkline & utilities visualziation to ahere to new architecture.
4. Started work on co-authorship freemarkerization.
5. Removed FileResponseValues type per talks with Rebecca Y. & Nick C.
6. Temporarily disabled person grant count visualization (freemarker version).
2010-12-16 01:18:39 +00:00
bkoniden
809ae7b162 Adding Freemarker versions of PersonGrantCount (QueryRunner, RequestHandler, VisCodeGenerator) and related ftls (grantCount, grantSparklineContent) 2010-12-15 22:48:42 +00:00