Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

49 time periods selector #52

Merged
merged 5 commits into from
Jan 23, 2016
Merged

49 time periods selector #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
608973f
New procedure to set period
Jan 22, 2016
4b69854
Buttons for moving period back and forth
Jan 22, 2016
e664291
Rename functions to avoid conflicts in future
Jan 22, 2016
67d2253
Using localization now
Jan 22, 2016
23ce4fa
If period is a month then switch to previous/next month correctly
Jan 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lang/en.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,9 @@ class LangEn extends iLang {
233 => "Fact date",
234 => "Order",
235 => "Complete goal",
236 => "Delete goal?"
236 => "Delete goal?",
237 => "Step to previous period",
238 => "Step to next period"
);

}
4 changes: 3 additions & 1 deletion lang/ru.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,9 @@ class LangRu extends iLang {
233 => "Фактическая дата",
234 => "Приоритет",
235 => "Выполнить цель",
236 => "Удалить цель?"
236 => "Удалить цель?",
237 => "Перейти к предыдущему периоду",
238 => "Перейти к следующему периоду"
);

}
83 changes: 79 additions & 4 deletions static/js/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,28 @@ function deleteItem(v_id) {


/* panel with grid */
var cash_list_prev_period =
{
xtype: 'button',
text: '<',
tooltip: lang(237),
name: 'cash_list_prev_period',
id: 'cash_list_prev_period',
handler: cashListSetPrevPeriod
}; // cash_list_prev_period

var cash_list_next_period =
{
xtype: 'button',
text: '>',
tooltip: lang(238),
name: 'cash_list_next_period',
id: 'cash_list_next_period',
handler: cashListSetNextPeriod
}; // cash_list_next_period



var cash_list_from_date =
{
xtype: 'datefield',
Expand Down Expand Up @@ -288,6 +310,50 @@ function listRefresh(_cb) {
setAnkhor();
}

function periodIsWholeMonth(start, end) {
var d1 = new Date(start);
var d2 = new Date(end);
return (
(d1.getDate()==1) &&
(d2.getDate()==32-new Date(d2.getYear(),d2.getMonth(), 32).getDate()) &&
((d2-d1) < 32*24*3600000) );
}

function cashListSetPeriod(d1, d2) {
if (new Date(d1) > Ext.getCmp('cash_list_from_date').maxValue) return;
var ChangeHandler = Ext.getCmp('cash_list_from_date').onChange;
Ext.getCmp('cash_list_from_date').onChange = function(){};
Ext.getCmp('cash_list_from_date').setValue(new Date(d1));
Ext.getCmp('cash_list_to_date').setValue(new Date(d2));
Ext.getCmp('cash_list_from_date').onChange = ChangeHandler;
}

function cashListSetPrevPeriod() {
var d1 = Ext.getCmp('cash_list_from_date').getValue();
var d2 = Ext.getCmp('cash_list_to_date').getValue();
var ddiff = d2 - d1;
if (periodIsWholeMonth(d1,d2)) {
d2 = d1-3600000;
d1 = new Date(d2);
d1.setDate(1);
cashListSetPeriod(d1,d2);
} else
cashListSetPeriod(d1.getTime()-ddiff, d2.getTime()-ddiff);
}

function cashListSetNextPeriod() {
var d1 = Ext.getCmp('cash_list_from_date').getValue();
var d2 = Ext.getCmp('cash_list_to_date').getValue();
var ddiff = d2 - d1;
if (periodIsWholeMonth(d1,d2)) {
d1 = d2.getTime()+24*3600000;
d2 = new Date(d1);
d2.setDate(32-new Date(d2.getYear(), d2.getMonth(), 32).getDate());
cashListSetPeriod(d1,d2);
} else
cashListSetPeriod(d1.getTime()+ddiff, d2.getTime()+ddiff);
}

/*var cash_list_refresh =
{
xtype: 'button',
Expand Down Expand Up @@ -409,7 +475,14 @@ var cash_list_tb = {
xtype: 'toolbar',
dock: 'top',
ui: 'footer',
items: [cash_list_from_date, " ", cash_list_to_date, " ", cash_list_filter, cash_list_filter_loading, '->', cash_list_edit_btn_ocr_check, " ", cash_list_edit_btn_add],
items: [cash_list_prev_period,
cash_list_from_date, " ",
cash_list_to_date,
cash_list_next_period, " ",
cash_list_filter,
cash_list_filter_loading, '->',
cash_list_edit_btn_ocr_check, " ",
cash_list_edit_btn_add],
region: 'north',
id: "cash_list_tb"
}; //cash_list_tb
Expand Down Expand Up @@ -544,8 +617,8 @@ function setListAnkhor() {
}

function setDefaultListVal() {
Ext.getCmp('cash_list_from_date').setValue(new Date((new Date).getTime() - (3600000*24*7)));
Ext.getCmp('cash_list_to_date').setValue(new Date());
cashListSetPeriod(new Date((new Date).getTime() - (3600000*24*7)),
new Date());
}


Expand Down Expand Up @@ -582,4 +655,6 @@ var cash_list_panel = Ext.create('Ext.Panel', {
}
}

});//cash_list_panel
});//cash_list_panel