Changeset 7832


Ignore:
Timestamp:
Jun 24, 2020, 9:41:43 AM (19 months ago)
Author:
Nicklas Nordborg
Message:

Merge BASE 3.16.2 to the trunk.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/core/net/sf/basedb/core/log/EntityDetails.java

    r7642 r7832  
    6060
    6161  public static final DateFormatter DATE_FORMAT = new DateFormatter("yyyy-MM-dd");
    62   public static final DateFormatter DATETIME_FORMAT = new DateFormatter("yyyy-MM-dd hh:mm:ss");
     62  public static final DateFormatter DATETIME_FORMAT = new DateFormatter("yyyy-MM-dd HH:mm:ss");
    6363 
    6464  private final Object entity;
  • trunk/src/core/net/sf/basedb/util/Values.java

    r7168 r7832  
    2323package net.sf.basedb.util;
    2424
    25 import java.text.SimpleDateFormat;
    2625import java.util.Date;
    2726import java.util.regex.Pattern;
     
    688687    return bytes;
    689688  }
    690  
    691  
    692   private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
    693   private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm:ss");
    694   private static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
    695 
    696689
    697690  /**
  • trunk/src/core/net/sf/basedb/util/parser/FlatFileParser.java

    r7738 r7832  
    701701   
    702702    * If no date format has been specified, yyyy-MM-dd is used
    703     * If no timestamp format has been specified, yyyy-MM-dd hh:mm:ss is used
     703    * If no timestamp format has been specified, yyyy-MM-dd HH:mm:ss is used
    704704    * If no number format has been specified, 'dot' is used
    705705    * The data splitter regular expression is changed to \\t
     
    722722      excelWorkbook = new XlsxToCsvUtil();
    723723      if (dateFormat == null) dateFormat = new DateFormatter("yyyy-MM-dd");
    724       if (timestampFormat == null) timestampFormat = new DateFormatter("yyyy-MM-dd hh:mm:ss");
     724      if (timestampFormat == null) timestampFormat = new DateFormatter("yyyy-MM-dd HH:mm:ss");
    725725      if (numberFormat == null) numberFormat = NumberFormatUtil.getNumberFormat('.', (char)0);
    726726      excelWorkbook.setDateFormat(dateFormat);
  • trunk/src/test/TestExcelFunctions.java

    r7728 r7832  
    129129      tw.setColumnFormatter(3, new NumberFormatter(2, true));
    130130      tw.setColumnFormatter(4, new DateFormatter("yyyy-MMM-dd"));
    131       tw.setColumnFormatter(5, new DateFormatter("yyyy-MMM-dd hh:mm"));
     131      tw.setColumnFormatter(5, new DateFormatter("yyyy-MMM-dd HH:mm"));
    132132     
    133133      data[0] = "Bar code";
  • trunk/www/common/annotations/annotate.js

    r7429 r7832  
    128128    if (annotationId)
    129129    {
    130       annotate.selectAnnotation(annotationTypeId+'-'+annotationId);
     130      annotate.selectAnnotation(annotationTypeId+'-'+annotationId, true);
    131131    }
    132132    else if (annotationTypeId)
    133133    {
    134       annotate.selectAnnotation(annotationTypeId)
     134      annotate.selectAnnotation(annotationTypeId, true);
    135135    }
    136136    else
     
    270270    and populate the input fields with the current value(s).
    271271  */
    272   annotate.selectAnnotation = function(entryId)
     272  annotate.selectAnnotation = function(entryId, scrollIntoView)
    273273  {
    274274    if (selectedAnnotation)
     
    305305        annotate.categoryOnChange();
    306306      }
    307       Doc.element(entryId).scrollIntoView(false);
     307      if (scrollIntoView) Doc.element(entryId).scrollIntoView({block: 'center'});
    308308     
    309309      var at = selectedAnnotation.annotationType;
Note: See TracChangeset for help on using the changeset viewer.