Project

General

Profile

« Previous | Next » 

Revision 0f5dbbcc

Added by Cherian Mathew about 9 years ago

edit/styles.scss : indent for synonyms
ConceptRelationshipPresenterTest : updated json to include direction

View differences:

src/main/webapp/VAADIN/themes/edit/edit.scss
37 37 
    /* Style specifically for the row header cells. */
38 38 
    .v-table-cell-content-synonym {
39 39 
       font-style: italic;
40 
        text-indent: 10px
40 41 
    }
41 42 

  		




  42
  43
  
    
    .cr-arrow .v-icon {


  		












  

    
      src/main/webapp/VAADIN/themes/edit/styles.css
    
  





  5895
  5895
  
    

  		




  5896
  5896
  
    
.edit .v-table-cell-content-synonym {


  		




  5897
  5897
  
    
	font-style: italic;


  		




  
  5898
  
    
	text-indent: 10px;


  		




  5898
  5899
  
    
}


  		




  5899
  5900
  
    

  		




  5900
  5901
  
    
.edit .cr-arrow .v-icon {


  		












  

    
      src/test/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.java
    
  





  47
  47
  
    
    public void testRefreshRelationshipView() throws JSONException {


  		




  48
  48
  
    
        UUID taxonUuid = UUID.fromString("5f713f69-e03e-4a11-8a55-700fbbf44805");


  		




  49
  49
  
    
        crp.refreshRelationshipView(new IdUuidName(30, taxonUuid, null), Direction.LEFT_RIGHT);


  		




  50
  
  
    
        String expected = "{\"name\":\"Taxon d\",\"children\":[{\"name\":\"Congruent to\",\"children\":[{\"name\":\"Taxon e\",\"uuid\":\"84e99e24-f50a-4726-92d0-6088430c492a\",\"type\":\"taxon\"}],\"uuid\":\"511f504b-ae3b-4f04-b7b9-35c222f06e10\",\"type\":\"conceptr\"},{\"name\":\"Includes\",\"children\":[{\"name\":\"Taxon a\",\"uuid\":\"eaac797e-cac7-4649-97cf-c7b580076895\",\"type\":\"taxon\"}],\"uuid\":\"0e8b7922-974d-4389-b71e-af6fc9f98c56\",\"type\":\"conceptr\"},{\"name\":\"Includes\",\"children\":[{\"name\":\"Taxon b\",\"uuid\":\"5004a8e7-b907-4744-b67e-44ccb057ab3b\",\"type\":\"taxon\"}],\"uuid\":\"6fd9947e-21c3-4190-8748-57d9661e8659\",\"type\":\"conceptr\"},{\"name\":\"Excludes\",\"children\":[{\"name\":\"Taxon c\",\"uuid\":\"3d71c8b8-3bec-4f5f-ba23-6f9d55ef84e9\",\"type\":\"taxon\"}],\"uuid\":\"cc761030-38d2-4b5d-954d-32329c0ea106\",\"type\":\"conceptr\"}],\"uuid\":\"5f713f69-e03e-4a11-8a55-700fbbf44805\",\"type\":\"taxon\"}";


  		




  
  50
  
    
        String expected = "{\"direction\":\"left-right\",\"name\":\"Taxon d\",\"children\":[{\"name\":\"Congruent to\",\"children\":[{\"name\":\"Taxon e\",\"uuid\":\"84e99e24-f50a-4726-92d0-6088430c492a\",\"type\":\"taxon\"}],\"uuid\":\"511f504b-ae3b-4f04-b7b9-35c222f06e10\",\"type\":\"conceptr\"},{\"name\":\"Includes\",\"children\":[{\"name\":\"Taxon a\",\"uuid\":\"eaac797e-cac7-4649-97cf-c7b580076895\",\"type\":\"taxon\"}],\"uuid\":\"0e8b7922-974d-4389-b71e-af6fc9f98c56\",\"type\":\"conceptr\"},{\"name\":\"Includes\",\"children\":[{\"name\":\"Taxon b\",\"uuid\":\"5004a8e7-b907-4744-b67e-44ccb057ab3b\",\"type\":\"taxon\"}],\"uuid\":\"6fd9947e-21c3-4190-8748-57d9661e8659\",\"type\":\"conceptr\"},{\"name\":\"Excludes\",\"children\":[{\"name\":\"Taxon c\",\"uuid\":\"3d71c8b8-3bec-4f5f-ba23-6f9d55ef84e9\",\"type\":\"taxon\"}],\"uuid\":\"cc761030-38d2-4b5d-954d-32329c0ea106\",\"type\":\"conceptr\"}],\"uuid\":\"5f713f69-e03e-4a11-8a55-700fbbf44805\",\"type\":\"taxon\"}";


  		




  51
  51
  
    
        logger.warn(crTree.getState().getConceptRelationshipTree());


  		




  52
  52
  
    
        Assert.assertEquals(expected, crTree.getState().getConceptRelationshipTree());


  		




  53
  53
  
    

  		




  54
  54
  
    
        taxonUuid = UUID.fromString("3d71c8b8-3bec-4f5f-ba23-6f9d55ef84e9");


  		




  55
  
  
    
        crp.refreshRelationshipView(new IdUuidName(20, taxonUuid, null), Direction.LEFT_RIGHT);


  		




  56
  
  
    
        expected = "{\"name\":\"Taxon c\",\"children\":[],\"uuid\":\"3d71c8b8-3bec-4f5f-ba23-6f9d55ef84e9\",\"type\":\"taxon\"}";


  		




  
  55
  
    
        crp.refreshRelationshipView(new IdUuidName(20, taxonUuid, null), Direction.RIGHT_LEFT);


  		




  
  56
  
    
        expected = "{\"direction\":\"right-left\",\"name\":\"Taxon c\",\"children\":[],\"uuid\":\"3d71c8b8-3bec-4f5f-ba23-6f9d55ef84e9\",\"type\":\"taxon\"}";


  		




  57
  57
  
    
        logger.warn(crTree.getState().getConceptRelationshipTree());


  		




  58
  58
  
    
        Assert.assertEquals(expected, crTree.getState().getConceptRelationshipTree());


  		




  59
  59
  
    

  		












Also available in:  Unified diff