You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/03/22 15:31:15 UTC
[royale-asjs] branch feature/jewel-datefield-year-month updated:
jewel-datechooser: shows all views content in the correct way
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch feature/jewel-datefield-year-month
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/jewel-datefield-year-month by this push:
new 8a64403 jewel-datechooser: shows all views content in the correct way
8a64403 is described below
commit 8a64403055866705db8d481a78096f08c608adde
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Mar 22 16:31:07 2019 +0100
jewel-datechooser: shows all views content in the correct way
---
.../projects/Jewel/src/main/resources/defaults.css | 4 ++++
.../royale/jewel/beads/models/DateChooserModel.as | 18 ++++++++----------
.../apache/royale/jewel/beads/views/DateChooserView.as | 6 +-----
.../royale/jewel/itemRenderers/DateItemRenderer.as | 2 +-
.../Jewel/src/main/sass/components/_datechooser.sass | 2 ++
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index d4e3176..02edad7 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -444,6 +444,10 @@ j|ComboBoxPopUp {
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ComboBoxPopUpView");
}
+.jewel.datechooser .jewel.table {
+ min-width: 324px;
+ min-height: 364px;
+}
.jewel.datechooser .jewel.table .jewel.tableheadercell {
padding: 12px 0px;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
index 2663115..01bc537 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
@@ -66,9 +66,11 @@ package org.apache.royale.jewel.beads.models
private var _selectedDate:Date;
private var _viewState:int = 0;
- private var _days:Array = new Array(42);
- private var _years:Array = new Array(24);
- private var _months:Array = ["JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"];
+ private var _months:Array = [];
+ public static const NUM_DAYS_VIEW:int = 42;
+ private var _days:Array = new Array(NUM_DAYS_VIEW);
+ public static const NUM_YEARS_VIEW:int = 24;
+ private var _years:Array = new Array(NUM_YEARS_VIEW);
/**
* 0 - days (calendar view): Select a day in a month calendar view, can navigate by months
@@ -286,13 +288,10 @@ package org.apache.royale.jewel.beads.models
} else if(viewState == 1)
{
i = 0;
- var yearNumber:int = new Date().getFullYear();
- // trace("yearNumber",yearNumber)
- var numYears:Number = 24;
- while(i < numYears)
+ var yearNumber:int = new Date().getFullYear() - NUM_YEARS_VIEW/2;
+ while(i < NUM_YEARS_VIEW)
{
- // trace(i," - ",(yearNumber + i));
- _years[i++] = new Date(yearNumber + i, 0, 1);
+ _years[i] = new Date(yearNumber + i++, 0, 1);
}
} else
{
@@ -304,7 +303,6 @@ package org.apache.royale.jewel.beads.models
_months[i++] = new Date(displayedYear, monthNumber++, 1);
}
}
-
}
/**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
index 6cff6a9..58dde46 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
@@ -237,7 +237,7 @@ package org.apache.royale.jewel.beads.views
} else if(model.viewState == 1)
{
// display "2016-2039"
- _viewSelector.text = String(model.displayedYear - 10) + "-" + String(model.displayedYear + 10);
+ _viewSelector.text = String(model.displayedYear - DateChooserModel.NUM_YEARS_VIEW/2) + "-" + String(model.displayedYear + DateChooserModel.NUM_YEARS_VIEW/2 - 1);
viewSelectorTableHeaderCell.expandColumns = 2;
} else
{
@@ -324,7 +324,6 @@ package org.apache.royale.jewel.beads.views
}
_table.dataProvider = new ArrayList(currrentMonth);
} else if(model.viewState == 1) {
- trace("model.years",model.years);
var currrentYearGroup:Array = [];
var yearIndex:int = 0;
for(i = 0; i < model.years.length/NUM_COLS_YEARS_OR_MONTHS; i++)
@@ -332,7 +331,6 @@ package org.apache.royale.jewel.beads.views
currrentYearGroup[i] = {};
for(j = 0; j < columns.length; j++)
{
- trace(yearIndex, model.years[yearIndex]);
currrentYearGroup[i]["d"+j] = model.years[yearIndex];
yearIndex++;
}
@@ -343,11 +341,9 @@ package org.apache.royale.jewel.beads.views
var monthIndex:int = 0;
for(i = 0; i < model.months.length/NUM_COLS_YEARS_OR_MONTHS; i++)
{
- trace("model.months",model.months);
currrentYear[i] = {};
for(j = 0; j < columns.length; j++)
{
- trace(monthIndex, model.months[monthIndex]);
currrentYear[i]["d"+j] = model.months[monthIndex];
monthIndex++;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as
index a974395..f218369 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as
@@ -75,7 +75,7 @@ package org.apache.royale.jewel.itemRenderers
text = String( (value[labelField] as Date).getFullYear());
} else {
var monthNames:Array = (itemRendererParent.parent.model as DateChooserModel).monthNames;
- text = String( (value[labelField] as Date).getMonth());
+ text = String(monthNames[(value[labelField] as Date).getMonth()]);
}
COMPILE::SWF {
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass b/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass
index 6b4b423..ca4e13e 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_datechooser.sass
@@ -28,6 +28,8 @@ $datechooser-tableitem-size: 38px
.jewel.datechooser
.jewel.table
+ min-width: 324px
+ min-height: 364px
.jewel.tableheadercell
padding: 12px 0px