rsence-pre 3.0.0.12 → 3.0.0.14

data/client/js/datetime/timesheet_item/themes/default/timesheet_item.css

@@ -1,72 +1,70 @@
-.timesheet_item,
-.timesheet_item_middle,
-.timesheet_item_label,
-.timesheet_item_resize_top,
-.timesheet_item_move,
-.timesheet_item_time,
-.timesheet_item_icons,
-.timesheet_item_resize_bottom {
+.default.timesheet_item,
+.default.timesheet_item > .middle,
+.default.timesheet_item > .middle > .label,
+.default.timesheet_item > .resize_top,
+.default.timesheet_item > .move,
+.default.timesheet_item > .time,
+.default.timesheet_item > .icons,
+.default.timesheet_item > .resize_bottom {
   position: absolute;
-  left: 0px; right: 0px;
+  left: 0; right: 0;
 }
-.timesheet_item {
-  top: 0px; bottom: 0px;
+.default.timesheet_item {
+  top: 0; bottom: 0;
   border: 1px solid #ccc;
   border-radius: 7px;
   opacity: 0.75;
 }
-.timesheet_item_time,
-.timesheet_item_label {
+.default.timesheet_item > .time,
+.default.timesheet_item > .middle > .label {
   font-size: 12px;
   color: #333;
   font-family: Helvetica, Arial, sans-serif;
 }
-.timesheet_item_time {
-  top: 0px; height: 12px; line-height: 12px;
+.default.timesheet_item > .time {
+  top: 0; height: 12px; line-height: 12px;
   text-indent: 4px; padding-top: 2px;
   font-weight: bold;
 }
-.active > .timesheet_item .timesheet_item_time {
+.default.timesheet_item.active > .time {
   border-radius: 7px 7px 0 0;
   border-bottom: 1px solid #000;
-/*  opacity: 0.2;*/
 }
-.active > .timesheet_item {
+.default.timesheet_item.active {
   border-color: #000;
   opacity: 1;
 }
-.timesheet_item_middle {
-  top: 50%; height: 0px;
+.default.timesheet_item > .middle {
+  top: 50%; height: 0;
   overflow: visible;
 }
-.timesheet_item_label {
+.default.timesheet_item > .middle > .label {
   text-align: center;
   opacity: 1;
   top: -6px; height: 12px;
 }
-.timesheet_item_resize_top {
-  top: 0px; height: 6px;
+.default.timesheet_item > .resize_top {
+  top: 0; height: 6px;
   cursor: n-resize;
 }
-.timesheet_item_move {
+.default.timesheet_item > .move {
   top: 6px; bottom: 6px;
   cursor: move;
 }
-.timesheet_item_resize_bottom {
-  bottom: 0px; height: 6px;
+.default.timesheet_item > .resize_bottom {
+  bottom: 0; height: 6px;
   cursor: s-resize;
 }
-.timesheet_item_icons {
-  top: 0px; height: 16px;
+.default.timesheet_item > .icons {
+  top: 0; height: 16px;
 }
-.timesheet_item_icon {
+.default.timesheet_item > .icons > .icon {
   position: absolute;
-  top: 0px; width: 16px; height: 16px;
-  background-position: 0px 0px;
+  top: 0; width: 16px; height: 16px;
+  background-position: 0 0;
 }
-
-.locked .timesheet_item_move,
-.locked .timesheet_item_resize_bottom,
-.locked .timesheet_item_resize_top {
+.default.timesheet_item.locked > .move,
+.default.timesheet_item.locked > .resize_bottom,
+.default.timesheet_item.locked > .resize_top {
   cursor: pointer;
 }

data/client/js/datetime/timesheet_item/themes/default/timesheet_item.html

@@ -1,10 +1,6 @@
-<div class="timesheet_item" id="bg]I[">
-  <div class="timesheet_item_time" id="state]I["></div>
-  <div class="timesheet_item_middle">
-    <div class="timesheet_item_label" id="label]I[">#{this.label}</div>
-  </div>
-  <div class="timesheet_item_icons" id="icons]I["></div>
-  <div class="timesheet_item_resize_top"></div>
-  <div class="timesheet_item_resize_bottom"></div>
-  <div class="timesheet_item_move" id="subview]I["></div>
-</div>
+<div class="time" id="state]I["></div>
+<div class="middle"><div class="label" id="label]I[">#{this.label}</div></div>
+<div class="icons" id="icons]I["></div>
+<div class="resize_top"></div>
+<div class="resize_bottom"></div>
+<div class="move" id="subview]I["></div>

data/client/js/datetime/timesheet_item/timesheet_item.coffee

@@ -0,0 +1,144 @@
+
+###
+## = Description
+## Item class to be used with HTimeSheet.
+###
+HTimeSheetItem = HControl.extend
+  componentName: 'timesheet_item'
+  markupElemNames: ['label', 'state', 'icons', 'value', 'subview']
+  controlDefaults: HControlDefaults.extend
+    displayTime: true
+    iconImage: 'timesheet_item_icons.png'
+  drawIcon: ( _iconOrder, _iconId )->
+    _iconElemId = ELEM.make( @markupElemIds.icons, 'div' )
+    _iconUrl = @getThemeGfxFile( @options.iconImage )
+    ELEM.addClassName( _iconElemId, 'icon' )
+    ELEM.setStyles( _iconElemId,
+      right:              (_iconOrder*16+_iconOrder)+'px'
+      backgroundPosition: '0px '+(_iconId*-16)+'px'
+      backgroundImage:    'url('+_iconUrl+')'
+    )
+    _iconElemId
+  clearAllIcons: ->
+    if @typeChr(@icons) == 'a'
+      for _iconId in @icons
+        ELEM.del( _iconId )
+    @icons = []
+  die: ->
+    @clearAllIcons()
+    @icons = null
+    @base()
+  refreshState: (_start, _duration)->
+    return unless @options.displayTime
+    _startTime = _start or @value.start
+    _endTime   = _startTime + ( _duration or @value.duration )
+    _locale    = HLocale.dateTime
+    _stateText = _locale.formatTime( _startTime ) + _locale.strings.rangeDelimitter + _locale.formatTime( _endTime )
+    ELEM.setHTML( @markupElemIds.state, _stateText )
+  refreshValue: ->
+    return unless @typeChr(@value) == 'h'
+    @drawRect()
+    if @value.color
+      @setStyle( 'backgroundColor', @value.color )
+    else
+      @setStyle( 'backgroundColor', '#999' )
+    @setLabel( @value.label ) if @value.label
+    if @value.locked
+      ELEM.addClassName( @elemId, 'locked' )
+    else
+      ELEM.delClassName( @elemId, 'locked' )
+    @refreshState()
+    @clearAllIcons()
+    if @typeChr( @value.icons ) == 'a'
+      for _icon, i in @value.icons
+        @icons.push( @drawIcon( i, _icon ) );
+  click: ->
+    @bringToFront()
+  doubleClick: ( x, y )->
+    @bringToFront()
+    @parent.activateEditor( this )
+
+  dragMode: 0 # none
+  _isValueValidForDrag: -> @typeChr(@value) == 'h' and not @value.locked
+  startDrag: (x, y)->
+    @bringToFront()
+    if @_isValueValidForDrag()
+      _topY = y-@pageY()
+      _bottomY = @rect.height - _topY
+      _resizeTop = ( _topY >= 0 && _topY <= 6 )
+      _resizeBottom = ( _bottomY >= 0 && _bottomY <= 6 )
+      _move = ( _topY > 6 && _bottomY > 6 )
+      if _resizeTop
+        @dragMode = 2 # resize-top
+      else if _resizeBottom
+        @dragMode = 3 # resize-bottom
+      else if _move
+        @dragMode = 1 # move
+      else
+        @dragMode = 0 # none
+      if @dragMode == 0
+        @originY = false
+      else
+        _originY   = y-@parent.pageY()
+        _parentY   = @parent.pageY()
+        _originTimeStart = @value.start
+        _originTimeEnd   = _originTimeStart + @value.duration
+        @originY = _originY
+        @originTopPx = @rect.top
+        @originBottomPx = @rect.bottom
+        @originTimeStart = _originTimeStart
+        @originTimeEnd   = _originTimeEnd
+        @originDuration  = _originTimeEnd - _originTimeStart
+        @dragTimeStart = _originTimeStart
+        @dragDuration  = @originDuration
+  drag: ( x, y )->
+    if @_isValueValidForDrag() and @dragMode != 0
+      y -= @parent.pageY()
+      _movePx    = y - @originY
+      _topPx     = @parent.snapPx( @originTopPx + _movePx )
+      _parentY   = @parent.pageY()
+      if @dragMode == 1 # move
+        _maxTopPx  = @parent.timeToPx( @parent.options.timeEnd ) - @rect.height
+        _topPx = _maxTopPx if _topPx > _maxTopPx
+        _timeStart = @parent.pxToTime(_topPx)
+        _duration  = @originDuration
+        @rect.offsetTo( @rect.left, _topPx )
+        @drawRect()
+        @dragTimeStart = _timeStart
+        @dragDuration  = _duration
+      else if @dragMode == 2 # resize-top
+        _maxTopPx  = @parent.timeToPx( @originTimeEnd - @parent.minDuration )
+        _topPx = _maxTopPx if _topPx > _maxTopPx
+        _timeStart = @parent.pxToTime(_topPx)
+        _timeEnd   = @originTimeEnd
+        if @rect.bottom - _topPx < @parent.options.itemMinHeight
+          _topPx = @rect.bottom - @parent.options.itemMinHeight
+        @rect.setTop( _topPx )
+        @drawRect()
+        @dragTimeStart = _timeStart
+        @dragDuration  = _timeEnd - _timeStart
+      else if @dragMode == 3 # resize-top
+        _minBottomPx  = @parent.timeToPx( @originTimeStart + @parent.minDuration  )
+        _bottomPx     = @parent.snapPx( @originBottomPx + _movePx )
+        _bottomPx = _minBottomPx if _bottomPx < _minBottomPx
+        _timeStart = @originTimeStart
+        _timeEnd   = @parent.pxToTime(_bottomPx)
+        if _bottomPx - @rect.top < @parent.options.itemMinHeight
+          _bottomPx = @rect.top + @parent.options.itemMinHeight
+        @rect.setBottom( _bottomPx )
+        @drawRect()
+        @dragTimeStart = _timeStart
+        @dragDuration  = _timeEnd - _timeStart
+      @refreshState( @dragTimeStart, @dragDuration )
+  endDrag: (x, y)->
+    if @_isValueValidForDrag() and @dragMode != 0
+      _startChanged = @dragTimeStart != @originTimeStart and @dragTimeStart != @value.start
+      _durationChanged = @dragDuration != @originDuration and @dragDuration != @value.duration
+      if _startChanged or _durationChanged
+        if @parent.editor
+          @parent.editor.modifyItem(
+            id:       @value.id
+            start:    @dragTimeStart
+            duration: @dragDuration
+            label:    @value.label
+          )

data/client/js/foundation/control/eventresponder/eventresponder.js

@@ -172,7 +172,6 @@ HEventResponder = HClass.extend({
   *
   **/
   setEnabled: function(_flag) {
-
     var
     _this = this,
     _elemId = this.elemId,
@@ -180,12 +179,12 @@ HEventResponder = HClass.extend({
     i = 0,
     _views = _this.views,
     _view,
-    _viewsLen = _views.length;
+    _viewsLen = _views?_views.length:0;
 
     // Enable/disable the children first.
     for (; i < _viewsLen; i++) {
       _view = _sysViews[_views[i]];
-      _view['setEnabled'] && _view.setEnabled(_flag);
+      _view.setEnabled && _view.setEnabled(_flag);
     }
 
     if (_this.enabled === _flag) {
@@ -195,7 +194,7 @@ HEventResponder = HClass.extend({
 
     _this.enabled = _flag;
 
-    if(_flag) {
+    if(_flag && _this.events) {
       EVENT.reg(_this, _this.events);
     }
     else {

data/client/js/foundation/eventmanager/eventmanager.coffee

@@ -417,6 +417,12 @@ EventManagerApp = HApplication.extend
         if ~_viewIdx
           @_listeners[_statusItem].splice(_viewIdx,1)
   #
+  # Cancels the drag operation for the ctrl
+  cancelDrag: (_ctrl)->
+    _dragIdx = @_listeners.dragged.indexOf(_ctrl.viewId)
+    if ~_dragIdx
+      @_listeners.dragged.splice( _dragIdx, 1 )
+  #
   # Registers the HControl -derived object _ctrl by event listener flags
   # in _eventOptions.
   reg: (_ctrl, _eventOptions)->

data/client/js/tables/table/table.coffee

@@ -11,6 +11,7 @@ HTable = HControl.extend
     cellBgColorDiff: '#080808' # color to add/subtract for even/odd col/row
     cellBorderWidth: 1 # cell border width in pixels
     cellBorderColor: '#fff' # cell border color
+    sortable: true # set to false, if table should not be sorted
   customOptions: (_options)->
     _options.headerCols = false unless _options.headerCols? # array of strings
     _options.sortDescending = [] unless _options.sortDescending? # column sorting by index; true for descending; false for ascending
@@ -63,17 +64,23 @@ HTable = HControl.extend
   _cellBgColorOf: (_row, _col)->
     _colorIndex = (_row%2) + (1-_col%2)
     @_cellBgColors[_colorIndex]
-  _drawCellStyles: ->
-    if @_bgCells?
-      for _bgCellId in @_bgCells
+  _destroyBgCells: ->
+    for _row in @_bgCells
+      for _bgCellId in _row
         ELEM.del( _bgCellId )
-      delete @_bgCells
+    delete @_bgCells
+  die: ->
+    @_destroyBgCells() if @_bgCells?
+    @_destroyHeader()
+    @base()
+  _drawCellStyles: (_1stIdx, _addCount)->
+    @_destroyBgCells() if @_bgCells? and not _1stIdx?
     return unless @colViews?
-    # the border width offset calculations are fubar; refactor when time available
-    @_bgCells = []
+    return unless @_rowsDrawn
+    @_bgCells = [] unless _1stIdx?
     _parent = @markupElemIds.grid
     _leftOffset = @headerSizes[0][0]
-    @_initCellBgColors()
+    @_initCellBgColors() unless _1stIdx?
     _borderSize = @options.cellBorderWidth
     _borderColor = @options.cellBorderColor
     _borderStyle = _borderSize+'px solid '+_borderColor
@@ -96,17 +103,20 @@ HTable = HControl.extend
         _width += _halfBorderWidth
       _top = _borderLeftOffset
       for _row, _rowNum in @_rows
-        @_bgCells.push ELEM.make(
-          _parent, 'div',
-          styles:
-            backgroundColor: @_cellBgColorOf(_rowNum,_colNum)
-            border: _borderStyle
-            top: _top+'px'
-            left: _left+'px'
-            width: _width+'px'
-            height: _height+'px'
-        )
+        unless _1stIdx? and _rowNum < _1stIdx
+          @_bgCells[_rowNum] = [] unless @_bgCells[_rowNum]?
+          @_bgCells[_rowNum][_colNum] = ELEM.make(
+            _parent, 'div',
+            styles:
+              backgroundColor: @_cellBgColorOf(_rowNum,_colNum)
+              border: _borderStyle
+              top: _top+'px'
+              left: _left+'px'
+              width: _width+'px'
+              height: _height+'px'
+          )
         _top += _topAdd
+    ELEM.flush()
   drawHeader: ->
     _elemIds = []
     _sizes = []
@@ -125,7 +135,7 @@ HTable = HControl.extend
     for _headerCol, i in @options.headerCols
       _elemId = ELEM.make( @markupElemIds.header, 'div' )
       @options.sortDescending[i] = false unless @options.sortDescending[i]?
-      ELEM.addClassName(_elemId,'table_header_column')
+      ELEM.addClassName(_elemId,'column')
       _width = 0
       if @options.colWidths[i]?
         if @options.colWidths[i] == 'auto'
@@ -137,7 +147,7 @@ HTable = HControl.extend
       _sizes.push([_left,_width])
       ELEM.setAttr(_elemId,'sortcol',i)
       ELEM.setHTML(_elemId,_headerCol)
-      if @options.sortCol == i
+      if @options.sortCol == i and @options.sortable
         _sortColElem = ELEM.make( _elemId, 'div' )
         if @options.headerStyles? and @options.headerStyles[i]?
           _sortColClassName( @options.headerStyles[i] )
@@ -154,7 +164,10 @@ HTable = HControl.extend
         e.preventDefault()
         true
       )
-      Event.observe(ELEM.get(_elemId),'click',_sortFns[i])
+      if @options.sortable
+        Event.observe(_elemId,'click',_sortFns[i])
+      else
+        ELEM.setStyle(_elemId,'cursor','default')
       _left += _width
       _elemIds.push( _elemId )
     if _autoWidths.length > 0
@@ -179,9 +192,10 @@ HTable = HControl.extend
     @headerSizes = _sizes
     @_sortColElem = _sortColElem
     @sortFns = _sortFns
+    ELEM.flush()
   resize: ->
     @drawHeader()
-    for _colNum in [0..@headerCols.length-1]
+    for _colNum in [0...@headerCols.length]
       _left = @headerSizes[_colNum][0] + 1
       _width = @headerSizes[_colNum][1]
       @colViews[_colNum].rect.offsetTo( _left, 0 )
@@ -287,24 +301,58 @@ HTable = HControl.extend
         _colViews[_colNum] = HView.nu( [ _left, 0, _width, 1 ], @ )
       @colViews = _colViews
     if @_rowsDrawn and not _newData
-      @sortTableRows()
+      @sortTableRows() if @options.sortable
     else if @_rowsDrawn and _newData and @_rows.length == @value.length
-      for _row, _rowNum in @value
+      @refreshTableValues()
+    else if @_rowsDrawn and _newData and @_rows.length > @value.length
+      _1stIdx  = @value.length
+      _lastIdx = @_rows.length-1
+      _delCount = _lastIdx-_1stIdx+1
+      for _rowNum in [_1stIdx.._lastIdx] by 1
+        _row = @_rows[_rowNum]
         for _col, _colNum in _row
           _ctrl = @_rows[_rowNum][_colNum]
-          _ctrl.setValue( _col )
-      @sortTableRows()
-    else
-      @createTableRows()
-  createTableRows: ->
-    @_destroyRows() if @_rowsDrawn
-    _start = new Date().getTime()
-    _top = 0
+          _ctrl.die()
+      @_rows.splice(_1stIdx,_delCount)
+      if @_bgCells?
+        for _row, _rowNum in @_bgCells
+          if _rowNum >= _1stIdx
+            for _bgCellId in _row
+              ELEM.del( _bgCellId )
+        @_bgCells.splice(_1stIdx,_delCount)
+      _top = 24 * _1stIdx
+      for _colView in @colViews
+        _colView.rect.setHeight(_top)
+        _colView.drawRect()
+      @refreshTableValues()
+    else if @_rowsDrawn and _newData and @_rows.length < @value.length
+      _1stIdx = @_rows.length
+      _lastIdx = @value.length-1
+      _addCount = _lastIdx - _1stIdx + 1
+      @refreshTableValues(_1stIdx)
+      @createTableRows(_1stIdx,_addCount)
+    else @createTableRows()
+  refreshTableValues: (_lastIdx)->
+    for _row, _rowNum in @value
+      break if _lastIdx? and _rowNum >= _lastIdx
+      for _col, _colNum in _row
+        _ctrl = @_rows[_rowNum][_colNum]
+        _ctrl.setValue( _col ) unless _ctrl.value == _col
+    @sortTableRows() if not _lastRow? and @options.sortable
+  createTableRows: (_1stIdx,_addCount)->
+    @_destroyRows() if @_rowsDrawn and not _1stIdx?
     _rowHeight = 24
-    _rows = []
-    _viewDefs = []
+    if _1stIdx?
+      _top = _1stIdx * _rowHeight
+      _rows = @_rows
+      _viewDefs = []
+    else
+      _top = 0
+      _rows = []
+      _viewDefs = []
     _colViews = @colViews
     for _row, _rowNum in @value
+      continue if _1stIdx? and _rowNum < _1stIdx
       _rows[_rowNum] = []
       for _col, _colNum in _row
         [ _colClass, _colOpts ] = @_getClassNameAndValueOfCol(_col, _colNum)
@@ -317,12 +365,16 @@ HTable = HControl.extend
     for _colView in _colViews
       _colView.rect.setHeight(_top)
       _colView.drawRect()
+    @_drawCellStyles(_1stIdx,_addCount) if _1stIdx? and @options.useCellGrid
     _finishDraw = =>
       @_rows = _rows
       @_rowsDrawn = true
-      @sortTableRows()
-      if @options.useCellGrid
-        @pushTask => @_drawCellStyles()
+      @sortTableRows() if @options.sortable
+      unless _1stIdx?
+        if @options.useCellGrid
+          @pushTask => @_drawCellStyles()
+        if @drawTableExtras?
+          @pushTask => @drawTableExtras()
     if _viewDefs.length > 0
       @pushTask =>
         _viewsToDraw = []
@@ -342,9 +394,9 @@ HTable = HControl.extend
             _viewsToDraw.push(_view)
         @pushTask =>
           _colView.draw() for _colView in _viewsToDraw
+          ELEM.flush()
           @pushTask( _finishDraw )
           _progress.die()
-          # console.log('table render took:',@msNow()-_start,'ms') if !@isProduction
     else _finishDraw()
   refreshTableCols: (_newData)->
     console.warn('HTable#refreshTableCols is not implemented yet!')

data/client/js/tables/table/themes/default/table.css

@@ -1,4 +1,4 @@
-.default > .table_header {
+.default.table > .header {
   position:absolute;
   left: 0; top: 0; right: 0; height: 22px;
   border: 1px solid #333;
@@ -11,25 +11,25 @@
   -moz-user-select: none;
   -khtml-user-select: none;
 }
-.default > .table_header > .table_header_column {
+.default.table > .header > .column {
   top: 1px; height: 20px; position: absolute;
   cursor: pointer; border-right: 1px solid #ccc;
   font-weight: bold;
   text-indent: 6px;
 }
-.default > .table_header > .table_header_column > .sort {
+.default.table > .header > .column > .sort {
   position: absolute; top: 1px; right: 2px;
 }
-.default > .table_header > .table_header_column > .sort_left {
+.default.table > .header > .column > .sort_left {
   position: absolute; top: 1px; left: 2px;
 }
-.default > .table_body {
+.default.table > .body {
   position: absolute; top: 24px; left: 0; right: 0; bottom: 0;
   overflow: auto; overflow-x: hidden;
 }
-.default > .table_body > .table_grid {
+.default.table > .body > .grid {
   position: absolute; top: 0; left: 0; overflow: visible;
 }
-.default > .table_body > .table_grid > div {
+.default.table > .body > .grid > div {
   position: absolute; height: 24px;
 }

data/client/js/tables/table/themes/default/table.html

@@ -1,4 +1,4 @@
-<div id="header]I[" class="table_header"></div>
-<div id="subview]I[" class="table_body">
-<div id="grid]I[" class="table_grid"></div>
+<div id="header]I[" class="header"></div>
+<div id="subview]I[" class="body">
+  <div id="grid]I[" class="grid"></div>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 3.0.0.12
+  version: 3.0.0.14
 platform: ruby
 authors:
 - Riassence Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps
@@ -236,11 +236,11 @@ files:
 - client/js/datetime/timepicker/timepicker.coffee
 - client/js/datetime/timesheet/themes/default/timesheet.css
 - client/js/datetime/timesheet/themes/default/timesheet.html
-- client/js/datetime/timesheet/timesheet.js
+- client/js/datetime/timesheet/timesheet.coffee
 - client/js/datetime/timesheet_item/themes/default/timesheet_item.css
 - client/js/datetime/timesheet_item/themes/default/timesheet_item.html
 - client/js/datetime/timesheet_item/themes/default/timesheet_item_icons.png
-- client/js/datetime/timesheet_item/timesheet_item.js
+- client/js/datetime/timesheet_item/timesheet_item.coffee
 - client/js/datetime/timesheet_item_edit/timesheet_item_edit.js
 - client/js/foundation/application/application.js
 - client/js/foundation/control/control.js