Skip to content

erp5
erp5
Commit 90266d64 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Start to use a better API in Planning for delimiter in Planning_generateAxis. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14940 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c75d1bc9
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 58 deletions
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Planning_generateAxis.xml
View file @ 90266d64
...@@ -97,17 +97,17 @@ if isinstance(axis_start,DateTime):\n ...@@ -97,17 +97,17 @@ if isinstance(axis_start,DateTime):\n
if float(axis_stop - axis_start) / date_type[1] >= delimiter_min_number:\n if float(axis_stop - axis_start) / date_type[1] >= delimiter_min_number:\n
good_type = date_type\n good_type = date_type\n
break\n break\n
\n
\n \n
delimiter = 0\n delimiter = 0\n
delimiter_list = []\n delimiter_list = []\n
delimiter_list.append([int(axis_start),\'\',axis_start.Day() + \' \' + str(DateTime(axis_start)), 0])\n delimiter_list.append({ \'relative_position\' : int(axis_start), \n
\n \'title\': \'\', \n
\'tooltip\' : str(axis_start), \n
\'delimiter_type\' : delimiter})\n
\n \n
#### Hour ###\n #### Hour ###\n
if good_type[0] == \'hour\':\n if good_type[0] == \'hour\':\n
pass\n pass\n
\n
\n \n
## 6 Hours ##\n ## 6 Hours ##\n
if good_type[0] == \'6hours\':\n if good_type[0] == \'6hours\':\n
...@@ -135,12 +135,12 @@ if isinstance(axis_start,DateTime):\n ...@@ -135,12 +135,12 @@ if isinstance(axis_start,DateTime):\n
delimiter = 1\n delimiter = 1\n
else:\n else:\n
delimiter = 0\n delimiter = 0\n
delimiter_list.append([int(current_date),\n delimiter_list.append({ \'relative_position\' : int(current_date),\n
\'%s. %s %s:00\' % (current_date.Day()[:1],\n \'title\': \'%s. %s %s:00\' % (current_date.Day()[:1],\n
str(current_date.day()),\n str(current_date.day()),\n
str(current_date.hour())),\n str(current_date.hour())),\n
current_date.Day() + \' \' + str(current_date),\n \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n
delimiter])\n \'delimiter_type\' : delimiter})\n
if current_date.hour() == 18:\n if current_date.hour() == 18:\n
#need to use the next day\n #need to use the next day\n
current_date = DateTime((current_date + 1).Date())\n current_date = DateTime((current_date + 1).Date())\n
...@@ -164,17 +164,14 @@ if isinstance(axis_start,DateTime):\n ...@@ -164,17 +164,14 @@ if isinstance(axis_start,DateTime):\n
delimiter = 1\n delimiter = 1\n
else:\n else:\n
delimiter = 0\n delimiter = 0\n
delimiter_list.append([int(current_date),\n delimiter_list.append({ \'relative_position\' : int(current_date),\n
\'%s/%s\' % (str(current_date.month()),\n \'title\': \'%s/%s\' % (str(current_date.month()),\n
str(current_date.day())),\n str(current_date.day())),\n
current_date.Day() + \' \' + str(current_date),\n \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n
delimiter\n \'delimiter_type\' : delimiter})\n
])\n
# go to next date\n # go to next date\n
current_date = current_date + 1\n current_date = current_date + 1\n
\n \n
\n
\n
\n \n
##### 3 DAYs ####\n ##### 3 DAYs ####\n
if good_type[0] == \'3days\':\n if good_type[0] == \'3days\':\n
...@@ -188,16 +185,13 @@ if isinstance(axis_start,DateTime):\n ...@@ -188,16 +185,13 @@ if isinstance(axis_start,DateTime):\n
delimiter = 1\n delimiter = 1\n
else:\n else:\n
delimiter = 0\n delimiter = 0\n
delimiter_list.append([int(current_date),\n delimiter_list.append({ \'relative_position\' : int(current_date),\n
\'%s/%s\' % (str(current_date.month()),\n \'title\': \'%s/%s\' % (str(current_date.month()),\n
str(current_date.day())),\n str(current_date.day())),\n
current_date.Day() + \' \' + str(current_date),\n \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n
delimiter\n \'delimiter_type\' : delimiter})\n
])\n
# go to next date\n # go to next date\n
current_date = current_date + 3\n current_date = current_date + 3\n
\n
\n
\n \n
#### WEEK ####\n #### WEEK ####\n
if good_type[0] == \'week\':\n if good_type[0] == \'week\':\n
...@@ -208,11 +202,10 @@ if isinstance(axis_start,DateTime):\n ...@@ -208,11 +202,10 @@ if isinstance(axis_start,DateTime):\n
current_date = current_date + 1\n current_date = current_date + 1\n
# getting list of weeks\n # getting list of weeks\n
while current_date < axis_stop:\n while current_date < axis_stop:\n
delimiter_list.append([int(current_date),\n delimiter_list.append({ \'relative_position\' : int(current_date),\n
str(current_date.month()) + \'/\' + str(current_date.day()),\n \'title\': str(current_date.month()) + \'/\' + str(current_date.day()),\n
current_date.Day() + \' \' + str(current_date),\n \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n
delimiter\n \'delimiter_type\' : delimiter})\n
])\n
current_date = current_date + 7\n current_date = current_date + 7\n
\n \n
\n \n
...@@ -235,11 +228,10 @@ if isinstance(axis_start,DateTime):\n ...@@ -235,11 +228,10 @@ if isinstance(axis_start,DateTime):\n
delimiter = 1\n delimiter = 1\n
else:\n else:\n
delimiter = 0\n delimiter = 0\n
delimiter_list.append([int(current_date),\n delimiter_list.append({ \'relative_position\' : int(current_date),\n
str(current_date.month()) + \'/\' + str(current_date.day()),\n \'title\': str(current_date.month()) + \'/\' + str(current_date.day()),\n
current_date.Day() + \' \' + str(current_date),\n \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n
delimiter\n \'delimiter_type\' : delimiter})\n
])\n
if current_date.month() == 12 and current_date.day() == 15:\n if current_date.month() == 12 and current_date.day() == 15:\n
# need to go to the next year\n # need to go to the next year\n
current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n
...@@ -267,11 +259,11 @@ if isinstance(axis_start,DateTime):\n ...@@ -267,11 +259,11 @@ if isinstance(axis_start,DateTime):\n
delimiter = 1\n delimiter = 1\n
else:\n else:\n
delimiter = 0\n delimiter = 0\n
delimiter_list.append([int(current_date),\n delimiter_list.append({ \'relative_position\' : int(current_date),\n
str(current_date.year()) + \'/\' + str(current_date.month()),\n \'title\': str(current_date.year()) + \'/\' + str(current_date.month()),\n
current_date.Day() + \' \' + str(current_date),\n \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n
delimiter\n \'delimiter_type\' : delimiter})\n
])\n \n
if current_date.month() == 12:\n if current_date.month() == 12:\n
# need to go to the next year\n # need to go to the next year\n
current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n
...@@ -297,11 +289,11 @@ if isinstance(axis_start,DateTime):\n ...@@ -297,11 +289,11 @@ if isinstance(axis_start,DateTime):\n
delimiter = 1\n delimiter = 1\n
else:\n else:\n
delimiter = 0\n delimiter = 0\n
delimiter_list.append([int(current_date),\n delimiter_list.append({ \'relative_position\' : int(current_date),\n
str(current_date.year()) + \'/\' + str(current_date.month()),\n \'title\': str(current_date.year()) + \'/\' + str(current_date.month()),\n
current_date.Day() + \' \' + str(current_date),\n \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n
delimiter\n \'delimiter_type\' : delimiter})\n
])\n \n
if current_date.month() > 9:\n if current_date.month() > 9:\n
# need to go to the next year\n # need to go to the next year\n
current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n
...@@ -323,11 +315,11 @@ if isinstance(axis_start,DateTime):\n ...@@ -323,11 +315,11 @@ if isinstance(axis_start,DateTime):\n
delimiter = 1\n delimiter = 1\n
else:\n else:\n
delimiter = 0\n delimiter = 0\n
delimiter_list.append([int(current_date),\n delimiter_list.append({ \'relative_position\' : int(current_date),\n
str(current_date.year()) + \'/\' + str(current_date.month()),\n \'title\': str(current_date.year()) + \'/\' + str(current_date.month()),\n
current_date.Day() + \' \' + str(current_date),\n \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n
delimiter\n \'delimiter_type\' : delimiter})\n
])\n \n
if current_date.month() > 6:\n if current_date.month() > 6:\n
# need to go to the next year\n # need to go to the next year\n
current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n
...@@ -346,11 +338,11 @@ if isinstance(axis_start,DateTime):\n ...@@ -346,11 +338,11 @@ if isinstance(axis_start,DateTime):\n
delimiter = 1\n delimiter = 1\n
else:\n else:\n
delimiter = 0\n delimiter = 0\n
delimiter_list.append([int(current_date),\n delimiter_list.append({ \'relative_position\' : int(current_date),\n
str(current_date.year()),\n \'title\': str(current_date.year()),\n
current_date.Day() + \' \' + str(current_date),\n \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n
delimiter\n \'delimiter_type\' : delimiter})\n
])\n \n
current_date = DateTime(str(current_date.year() + 1) + \'/1/1\')\n current_date = DateTime(str(current_date.year() + 1) + \'/1/1\')\n
\n \n
return delimiter_list\n return delimiter_list\n
...@@ -367,10 +359,12 @@ else:\n ...@@ -367,10 +359,12 @@ else:\n
while step * delimiter_min_number < axis_range:\n while step * delimiter_min_number < axis_range:\n
good_step = step\n good_step = step\n
step = step * 10\n step = step * 10\n
\n
\n \n
# now adding first value\n # now adding first value\n
delimiter_list.append([axis_start,\'\',str(axis_start),0])\n delimiter_list.append({ \'relative_position\' : int(axis_start), \n
\'title\': \'\', \n
\'tooltip\' : str(axis_start), \n
\'delimiter_type\' : 0})\n
\n \n
# now going to first good step\n # now going to first good step\n
modul = axis_start % good_step\n modul = axis_start % good_step\n
...@@ -387,7 +381,10 @@ else:\n ...@@ -387,7 +381,10 @@ else:\n
\n \n
# iterating and adding each value\n # iterating and adding each value\n
while current_step < axis_stop:\n while current_step < axis_stop:\n
delimiter_list.append([current_step,str(current_step),str(current_step),0])\n delimiter_list.append({ \'relative_position\' : current_step, \n
\'title\': str(current_step), \n
\'tooltip\' : str(current_step), \n
\'delimiter_type\' : 0})\n
current_step += good_step\n current_step += good_step\n
\n \n
return delimiter_list\n return delimiter_list\n
......
product/ERP5/bootstrap/erp5_core/bt/revision
View file @ 90266d64
353 355
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7