rsence-pre 2.2.0.0 → 2.2.0.1

data/VERSION

@@ -1 +1 @@
-2.2.0.0.pre
+2.2.0.1.pre

data/conf/default_conf.yaml

@@ -282,6 +282,7 @@
       datetime:
         - datetimevalue       # HDateTime
         - calendar            # HCalendar
+        - datetimepicker      # HDateTimePicker
         - timesheet           # HTimeSheet
         - timesheet_item      # HTimeSheetItem
         - timesheet_item_edit # HTimeSheetItemEditor

data/js/datetime/datetimepicker/datetimepicker.js

@@ -0,0 +1,215 @@
+/*   RSence
+ *   Copyright 2010 Riassence Inc.
+ *   http://riassence.com/
+ *
+ *   You should have received a copy of the GNU General Public License along
+ *   with this software package. If not, contact licensing@riassence.com
+ */
+
+var
+HDateTimePicker = HControl.extend({
+  setLocked: function(_lockedState){
+    var
+    _enabledState = !_lockedState;
+    this.yyyy.setEnabled(_enabledState);
+    this.mm.setEnabled(_enabledState);
+    this.dd.setEnabled(_enabledState);
+    this.h.setEnabled(_enabledState);
+    this.m.setEnabled(_enabledState);
+  },
+  refreshValue: function(_readMode){
+    if(!this.drawn){
+      return;
+    }
+    if(!this.m){
+      return;
+    }
+    this.setLocked( HVM.values[ this.options.lockedId ].value );
+    var
+    date = new Date( this.value*1000 ),
+    yyyy = date.getUTCFullYear(),
+    mm = date.getUTCMonth()+1,
+    dd = date.getUTCDate(),
+    h = date.getUTCHours(),
+    m = date.getUTCMinutes();
+    if(_readMode){
+      var
+      nuDate = new Date( this.value*1000 ),
+      doSet = false;
+      if(this.yyyyValue.value !== yyyy){
+        nuDate.setUTCFullYear( this.yyyyValue.value ); doSet = true;
+      }
+      if(this.mmValue.value !== mm){
+        nuDate.setUTCMonth( this.mmValue.value-1 ); doSet = true;
+      }
+      if(this.ddValue.value !== dd){
+        nuDate.setUTCDate( this.ddValue.value ); doSet = true;
+      }
+      if(this.hValue.value !== h){
+        nuDate.setUTCHours( this.hValue.value ); doSet = true;
+      }
+      if(this.mValue.value !== m){
+        nuDate.setUTCMinutes( this.mValue.value ); doSet = true;
+      }
+      if(doSet){
+        this.setValue( nuDate.getTime()/1000 );
+        this.setMonthMax( nuDate );
+      }
+    }
+    else{
+      this.yyyyValue.set( yyyy );
+      this.mmValue.set( mm );
+      this.ddValue.set( dd );
+      this.hValue.set( h );
+      this.mValue.set( m );
+    }
+  },
+  setMonthMax: function( nuDate ){
+    nuDate.setUTCSeconds( 0 );
+    nuDate.setUTCMinutes( 0 );
+    nuDate.setUTCHours( 0 );
+    nuDate.setUTCDate( 1 );
+    var
+    mm = nuDate.getUTCMonth();
+    if(mm === 11){
+      nuDate.setUTCMonth( 0 );
+      nuDate.setUTCFullYear( nuDate.getUTCFullYear()+1 );
+    }
+    else {
+      nuDate.setUTCMonth( mm+1 );
+    }
+    var
+    ms = nuDate.getTime() - 1000,
+    maxDaysDate = new Date(ms),
+    maxDays = maxDaysDate.getUTCDate();
+    // console.log('maxDaysDate:',maxDaysDate.getUTCFullYear(),'-',maxDaysDate.getUTCMonth(),'-',maxDaysDate.getUTCDate());
+    // console.log('maxDays:',maxDays);
+    if(maxDays !== this.dd.numField.options.maxValue){
+      // console.log('reset maxValue..');
+      this.dd.numField.options.maxValue = maxDays;
+      (this.dd.numField.options.maxValue < this.dd.numField.value) && this.ddValue.set( maxDays );
+      this.dd.stepper.options.maxValue = maxDays;
+    }
+  },
+  die: function(){
+    this.yyyyValue.die();
+    this.yyyy.die();
+    this.mmValue.die();
+    this.mm.die();
+    this.ddValue.die();
+    this.dd.die();
+    this.hValue.die();
+    this.h.die();
+    this.mValue.die();
+    this.m.die();
+    this.base();
+  },
+  drawSubviews: function(){
+    var
+    _NumStepperField = HView.extend({
+      setEnabled: function(_state){
+        this.numField.setEnabled(_state);
+        this.stepper.setEnabled(_state);
+        if(_state){
+          this.stepper.show();
+        }
+        else{
+          this.stepper.hide();
+        }
+      },
+      drawSubviews: function(){
+        this.numField = HNumericTextControl.extend({
+          refreshValue: function(){
+            this.base();
+            this.parent.parent.refreshValue(true);
+          },
+          textBlur: function(){
+            this.setValue(
+              this.validateText(
+                this.getTextFieldValue()
+              )
+            );
+          }
+        }).nu(
+          [ 0, 0, this.rect.width-10, 21 ],
+          this, {
+            events: {
+              textEnter: false
+            },
+            minValue: this.options.minValue,
+            maxValue: this.options.maxValue,
+            valueObj: this.options.valueObj
+          }
+        );
+        this.stepper = HStepper.nu(
+          [ this.rect.width-15, 0, 15, 21 ],
+          this, {
+            minValue: this.options.minValue,
+            maxValue: this.options.maxValue,
+            valueObj: this.options.valueObj
+          }
+        );
+      }
+    }),
+    _numStepperRect = HRect.nu( 0, 0, 50, 21 );
+    this.yyyyValue = HValue.nu( false, 2010 );
+    this.yyyy = _NumStepperField.nu(
+      HRect.nu( _numStepperRect ),
+      this, {
+        minValue: 2010,
+        maxValue: 2020,
+        valueObj: this.yyyyValue
+      }
+    );
+    _numStepperRect.setWidth( 35 );
+    _numStepperRect.offsetBy( 55, 0 );
+    this.mmValue = HValue.nu( false, 12 );
+    this.mm = _NumStepperField.nu(
+      HRect.nu( _numStepperRect ),
+      this, {
+        minValue: 1,
+        maxValue: 12,
+        valueObj: this.mmValue
+      }
+    );
+    _numStepperRect.offsetBy( 40, 0 );
+    this.ddValue = HValue.nu( false, 24 );
+    this.dd = _NumStepperField.nu(
+      HRect.nu( _numStepperRect ),
+      this, {
+        minValue: 1,
+        maxValue: 31,
+        valueObj: this.ddValue
+      }
+    );
+    _numStepperRect.offsetBy( 50, 0 );
+    this.hValue = HValue.nu( false, 22 );
+    this.h = _NumStepperField.nu(
+      HRect.nu( _numStepperRect ),
+      this, {
+        minValue: 0,
+        maxValue: 23,
+        valueObj: this.hValue
+      }
+    );
+    _numStepperRect.offsetBy( 40, 0 );
+    this.mValue = HValue.nu( false, 45 );
+    this.m = _NumStepperField.nu(
+      HRect.nu( _numStepperRect ),
+      this, {
+        minValue: 0,
+        maxValue: 59,
+        valueObj: this.mValue
+      }
+    );
+    _numStepperRect.offsetBy( 37, 2 );
+    _numStepperRect.setWidth( 60 );
+    HStringView.nu(
+      HRect.nu( _numStepperRect ),
+      this, {
+        valueObj: HVM.values[this.options.tzValueId]
+      }
+    );
+    this.refreshValue();
+  }
+});

data/js/datetime/timesheet/timesheet.js

@@ -236,7 +236,6 @@ HTimeSheet = HControl.extend({
   },
   
   click: function( x, y, b ){
-    // console.log('click');
     if( !this.startDragTime ){
       this.clickCreate( x,y );
       this.clickCreated = true;
@@ -245,26 +244,22 @@ HTimeSheet = HControl.extend({
   },
   
   clickCreate: function(x,y){
-    // console.log('clickCreate');
-    y -= this.pageY();
     var
-    _startTime = this.pxToTime( y ),
+    _startTime = this.pxToTime( y-this.pageY() ),
     _endTime = _startTime + this.minDuration;
+    console.log('start:',(new Date(_startTime*1000)).toUTCString(),', end:',(new Date(_endTime*1000)).toUTCString());
     this.refreshDragPreview( _startTime, _endTime );
     this.dragPreview.bringToFront();
     this.dragPreview.show();
     if( this.activateEditor( this.dragPreview ) ){
-      // console.log('create!');
       this.editor.createItem( HVM.clone( this.dragPreview.value ) );
     }
     else {
-      // console.log('no create');
       this.dragPreview.hide();
     }
   },
   
   doubleClick: function(x,y){
-    // console.log('doubleClick');
     if( !this.clickCreated ){
       this.click(x,y);
     }
@@ -284,8 +279,8 @@ HTimeSheet = HControl.extend({
   },
   
   startDrag: function( x, y, b ){
-    y -= this.pageY();
-    this.startDragTime = this.pxToTime( y );
+    this.startDragTime = this.pxToTime( y-this.pageY() );
+    // y -= this.pageY();
     this.refreshDragPreview( this.startDragTime, this.startDragTime + this.minDuration );
     this.dragPreview.bringToFront();
     this.dragPreview.show();
@@ -293,9 +288,8 @@ HTimeSheet = HControl.extend({
   },
   
   drag: function( x, y, b ){
-    y -= this.pageY();
     var
-    _dragTime = this.pxToTime( y ),
+    _dragTime = this.pxToTime( y-this.pageY() ),
     _startTime,
     _endTime;
     if( _dragTime < this.startDragTime ){
@@ -311,8 +305,8 @@ HTimeSheet = HControl.extend({
   },
   
   endDrag: function( x, y, b ){
-    y -= this.pageY();
-    var _dragTime = this.pxToTime( y );
+    var
+    _dragTime = this.pxToTime( y-this.pageY() );
     if( _dragTime !== this.startDragTime ){
       if( this.activateEditor( this.dragPreview ) ){
         this.editor.createItem( HVM.clone( this.dragPreview.value ) );
@@ -322,6 +316,7 @@ HTimeSheet = HControl.extend({
     this.clickCreated = false;
     this.dragPreview.hide();
     this.startDragTime = false;
+    this.click( x, y, b );
     return false;
   },
   

data/js/datetime/timesheet_item/timesheet_item.js

@@ -85,15 +85,15 @@ HTimeSheetItem = HControl.extend({
     this.bringToFront();
     var _time = this.parent.pxToTime( y-this.parent.pageY() );
     this.parent.activateEditor( this );
-    // if( this.parent.activateEditor( this ) ){
-    //   // console.log('editor start');
-    // }
   },
   
   dragMode: 0, // none
+  _isValueValidForDrag: function(){
+    return (this.value instanceof Object) && (!this.value.locked);
+  },
   startDrag: function( x, y ){
     this.bringToFront();
-    if( !this.value.locked ){
+    if( this._isValueValidForDrag() ){
       var
       _topY = y-this.pageY(),
       _bottomY = this.rect.height - _topY,
@@ -134,7 +134,7 @@ HTimeSheetItem = HControl.extend({
   },
   
   drag: function( x, y ){
-    if( !this.value.locked && this.dragMode !== 0 ){
+    if( this._isValueValidForDrag() && (this.dragMode !== 0) ){
       y -= this.parent.pageY();
       var
       _movePx    = y - this.originY,
@@ -189,7 +189,7 @@ HTimeSheetItem = HControl.extend({
   },
   
   endDrag: function( x, y ){
-    if( !this.value.locked && this.dragMode !== 0 ){
+    if( this._isValueValidForDrag() && (this.dragMode !== 0) ){
       var
       _startChanged = ( this.dragTimeStart !== this.originTimeStart ) && ( this.dragTimeStart !== this.value.start ),
       _durationChanged = ( this.dragDuration !== this.originDuration ) && ( this.dragDuration !== this.value.duration );

data/lib/session/msg.rb

@@ -302,6 +302,7 @@ module RSence
     def console(data)
       reply( "console.log(#{data.to_json});" )
     end
+    alias puts console
     
     # Serves an image object and returns its disposable URL.
     # Calls the default `ticket` plugin.

metadata

@@ -1,57 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rsence-pre
-version: !ruby/object:Gem::Version 
-  hash: 127
+version: !ruby/object:Gem::Version
+  version: 2.2.0.1
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 0
-  - 0
-  version: 2.2.0.0
 platform: ruby
-authors: 
+authors:
 - Riassence Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-05 00:00:00 +02:00
+date: 2011-03-11 00:00:00.000000000 +02:00
 default_executable: rsence-pre
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rsence-deps
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2161100580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 1925
-        segments: 
-        - 963
-        version: "963"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: '963'
   type: :runtime
-  version_requirements: *id001
-description: |
-  RSence is a RIA ("HTML5" or "Ajax" if you like those terms better) framework designed for responsive GUI applications on the web.
-  
-  RSence is a flexible and high-performance RIA framework aimed on building responsive, scalable and over-all as high-performance GUI Applications as possible with the chosen technologies.
-  
-  RSence includes a server for backend tasks and client suppert as well as a Javascript GUI framework to provide responsive user interfaces.
-  
-  The purpose of the server is to provide a highly optimized yet easy to use Ruby framework for writing applications containing all their assets needed as self-contained plugins bundles. The bundles enable easy distribution and maintenance of RSence projects.
-  
-  RSence is not primarily targeted as an engine for plain old html web sites, there are plenty of other tools for that purpose and some of them are easily integrated into RSence.
+  prerelease: false
+  version_requirements: *2161100580
+description: ! 'RSence is a RIA ("HTML5" or "Ajax" if you like those terms better)
+  framework designed for responsive GUI applications on the web.
+
+
+  RSence is a flexible and high-performance RIA framework aimed on building responsive,
+  scalable and over-all as high-performance GUI Applications as possible with the
+  chosen technologies.
+
+
+  RSence includes a server for backend tasks and client suppert as well as a Javascript
+  GUI framework to provide responsive user interfaces.
+
+
+  The purpose of the server is to provide a highly optimized yet easy to use Ruby
+  framework for writing applications containing all their assets needed as self-contained
+  plugins bundles. The bundles enable easy distribution and maintenance of RSence
+  projects.
 
+
+  RSence is not primarily targeted as an engine for plain old html web sites, there
+  are plenty of other tools for that purpose and some of them are easily integrated
+  into RSence.
+
+'
 email: info@rsence.org
-executables: 
+executables:
 - rsence-pre
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/rsence
 - lib/conf/argv.rb
 - lib/conf/default.rb
@@ -278,6 +279,8 @@ files:
 - js/datetime/calendar/themes/default/calendar.html
 - js/datetime/calendar/themes/default/calendar_arrows-ie6.gif
 - js/datetime/calendar/themes/default/calendar_arrows.png
+- js/datetime/datetimepicker/datetimepicker.js
+- js/datetime/datetimepicker/js.inc
 - js/datetime/datetimevalue/datetimevalue.js
 - js/datetime/datetimevalue/js.inc
 - js/datetime/timesheet/js.inc
@@ -385,43 +388,29 @@ files:
 - VERSION
 - .yardopts
 - bin/rsence-pre
-has_rdoc: yard
+has_rdoc: true
 homepage: http://www.rsence.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: rsence-
 rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Pre-Release 2.2 version of the RSence framework.
 test_files: []
-