Project

General

Profile

Revision 84bb1d2c

ID84bb1d2cdb8a7a0940239a9eb4e7468a25564a86
Parent d178ecb9
Child e4b34dc5

Added by Andreas Kohlbecker about 3 years ago

ref #6086 solving the problems in the java-script of the web application monitor widget:
- chunk information: number rounded and label renamed
- Percentage number rounding fixed

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java
2029 2029
        Assert.assertFalse("Name should be parsable", name.isProtectedTitleCache());
2030 2030
        assertEquals( "30(Vorabdr.)", ((Reference)name.getNomenclaturalReference()).getVolume());
2031 2031

  
2032
        /* test case disabled, would fail!
2032
        /* test case disabled, would fail! This is not due to the '´t' it rather might be caused by the & in the basionym authors
2033 2033
        // Sempervivum globiferum subsp. allionii (Jord. & Fourr.) ´t Hart & Bleij
2034 2034
        name = parser.parseReferencedName("Sempervivum globiferum subsp. allionii (Jord. & Fourr.) ´t Hart & Bleij");
2035 2035
        Assert.assertFalse("Name should be parsable", name.isProtectedTitleCache());
cdmlib-remote-webapp/src/main/webapp/js/cdm_ws_progress.js
101 101

  
102 102
    var showProgress = function(monitor){
103 103
      $progress_titel.text(monitor.taskName);
104
      var percentTwoDecimalDigits = Math.floor(monitor.percentage * 100) / 100;
104
      var percentTwoDecimalDigits = Math.round(monitor.percentage * 100) / 100;
105 105
      $progress_bar_value.text(percentTwoDecimalDigits + "%");
106 106
      $progress_bar_indicator.css('width', percentTwoDecimalDigits + "%");
107 107
      if(monitor.failed){
......
110 110
        $progress_status.text("Done");
111 111
        isRunning = false;
112 112
      } else {
113
        $progress_status.text(monitor.subTask + " [chunk " + monitor.workDone + "/" + monitor.totalWork + "]");
113
        $progress_status.text(monitor.subTask + " [work ticks: " + (Math.round(monitor.workDone * 100) / 100) + "/" + monitor.totalWork + "]");
114 114
      }
115 115
      window.setTimeout(monitorProgess, pollInterval_ms);
116 116
    };

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)