From 90266d645202c201f04e9616ecd3f2fb1fd9bb95 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Sun, 24 Jun 2007 21:08:16 +0000 Subject: [PATCH] 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 --- .../erp5_core/Planning_generateAxis.xml | 111 +++++++++--------- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 2 files changed, 55 insertions(+), 58 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Planning_generateAxis.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Planning_generateAxis.xml index 0667775191..173941630d 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Planning_generateAxis.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Planning_generateAxis.xml @@ -97,17 +97,17 @@ if isinstance(axis_start,DateTime):\n if float(axis_stop - axis_start) / date_type[1] >= delimiter_min_number:\n good_type = date_type\n break\n -\n \n delimiter = 0\n delimiter_list = []\n - delimiter_list.append([int(axis_start),\'\',axis_start.Day() + \' \' + str(DateTime(axis_start)), 0])\n -\n + delimiter_list.append({ \'relative_position\' : int(axis_start), \n + \'title\': \'\', \n + \'tooltip\' : str(axis_start), \n + \'delimiter_type\' : delimiter})\n \n #### Hour ###\n if good_type[0] == \'hour\':\n pass\n -\n \n ## 6 Hours ##\n if good_type[0] == \'6hours\':\n @@ -135,12 +135,12 @@ if isinstance(axis_start,DateTime):\n delimiter = 1\n else:\n delimiter = 0\n - delimiter_list.append([int(current_date),\n - \'%s. %s %s:00\' % (current_date.Day()[:1],\n + delimiter_list.append({ \'relative_position\' : int(current_date),\n + \'title\': \'%s. %s %s:00\' % (current_date.Day()[:1],\n str(current_date.day()),\n str(current_date.hour())),\n - current_date.Day() + \' \' + str(current_date),\n - delimiter])\n + \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n + \'delimiter_type\' : delimiter})\n if current_date.hour() == 18:\n #need to use the next day\n current_date = DateTime((current_date + 1).Date())\n @@ -164,17 +164,14 @@ if isinstance(axis_start,DateTime):\n delimiter = 1\n else:\n delimiter = 0\n - delimiter_list.append([int(current_date),\n - \'%s/%s\' % (str(current_date.month()),\n - str(current_date.day())),\n - current_date.Day() + \' \' + str(current_date),\n - delimiter\n -])\n + delimiter_list.append({ \'relative_position\' : int(current_date),\n + \'title\': \'%s/%s\' % (str(current_date.month()),\n + str(current_date.day())),\n + \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n + \'delimiter_type\' : delimiter})\n # go to next date\n current_date = current_date + 1\n \n -\n -\n \n ##### 3 DAYs ####\n if good_type[0] == \'3days\':\n @@ -188,16 +185,13 @@ if isinstance(axis_start,DateTime):\n delimiter = 1\n else:\n delimiter = 0\n - delimiter_list.append([int(current_date),\n - \'%s/%s\' % (str(current_date.month()),\n - str(current_date.day())),\n - current_date.Day() + \' \' + str(current_date),\n - delimiter\n -])\n + delimiter_list.append({ \'relative_position\' : int(current_date),\n + \'title\': \'%s/%s\' % (str(current_date.month()),\n + str(current_date.day())),\n + \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n + \'delimiter_type\' : delimiter})\n # go to next date\n current_date = current_date + 3\n -\n -\n \n #### WEEK ####\n if good_type[0] == \'week\':\n @@ -208,11 +202,10 @@ if isinstance(axis_start,DateTime):\n current_date = current_date + 1\n # getting list of weeks\n while current_date < axis_stop:\n - delimiter_list.append([int(current_date),\n - str(current_date.month()) + \'/\' + str(current_date.day()),\n - current_date.Day() + \' \' + str(current_date),\n - delimiter\n -])\n + delimiter_list.append({ \'relative_position\' : int(current_date),\n + \'title\': str(current_date.month()) + \'/\' + str(current_date.day()),\n + \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n + \'delimiter_type\' : delimiter})\n current_date = current_date + 7\n \n \n @@ -235,11 +228,10 @@ if isinstance(axis_start,DateTime):\n delimiter = 1\n else:\n delimiter = 0\n - delimiter_list.append([int(current_date),\n - str(current_date.month()) + \'/\' + str(current_date.day()),\n - current_date.Day() + \' \' + str(current_date),\n - delimiter\n -])\n + delimiter_list.append({ \'relative_position\' : int(current_date),\n + \'title\': str(current_date.month()) + \'/\' + str(current_date.day()),\n + \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n + \'delimiter_type\' : delimiter})\n if current_date.month() == 12 and current_date.day() == 15:\n # need to go to the next year\n current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n @@ -267,11 +259,11 @@ if isinstance(axis_start,DateTime):\n delimiter = 1\n else:\n delimiter = 0\n - delimiter_list.append([int(current_date),\n - str(current_date.year()) + \'/\' + str(current_date.month()),\n - current_date.Day() + \' \' + str(current_date),\n - delimiter\n -])\n + delimiter_list.append({ \'relative_position\' : int(current_date),\n + \'title\': str(current_date.year()) + \'/\' + str(current_date.month()),\n + \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n + \'delimiter_type\' : delimiter})\n +\n if current_date.month() == 12:\n # need to go to the next year\n current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n @@ -297,11 +289,11 @@ if isinstance(axis_start,DateTime):\n delimiter = 1\n else:\n delimiter = 0\n - delimiter_list.append([int(current_date),\n - str(current_date.year()) + \'/\' + str(current_date.month()),\n - current_date.Day() + \' \' + str(current_date),\n - delimiter\n -])\n + delimiter_list.append({ \'relative_position\' : int(current_date),\n + \'title\': str(current_date.year()) + \'/\' + str(current_date.month()),\n + \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n + \'delimiter_type\' : delimiter})\n +\n if current_date.month() > 9:\n # need to go to the next year\n current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n @@ -323,11 +315,11 @@ if isinstance(axis_start,DateTime):\n delimiter = 1\n else:\n delimiter = 0\n - delimiter_list.append([int(current_date),\n - str(current_date.year()) + \'/\' + str(current_date.month()),\n - current_date.Day() + \' \' + str(current_date),\n - delimiter\n -])\n + delimiter_list.append({ \'relative_position\' : int(current_date),\n + \'title\': str(current_date.year()) + \'/\' + str(current_date.month()),\n + \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n + \'delimiter_type\' : delimiter})\n +\n if current_date.month() > 6:\n # need to go to the next year\n current_date = DateTime(str(current_date.year() + 1) + \'/1/1\' )\n @@ -346,11 +338,11 @@ if isinstance(axis_start,DateTime):\n delimiter = 1\n else:\n delimiter = 0\n - delimiter_list.append([int(current_date),\n - str(current_date.year()),\n - current_date.Day() + \' \' + str(current_date),\n - delimiter\n -])\n + delimiter_list.append({ \'relative_position\' : int(current_date),\n + \'title\': str(current_date.year()),\n + \'tooltip\' : current_date.Day() + \' \' + str(current_date),\n + \'delimiter_type\' : delimiter})\n +\n current_date = DateTime(str(current_date.year() + 1) + \'/1/1\')\n \n return delimiter_list\n @@ -367,10 +359,12 @@ else:\n while step * delimiter_min_number < axis_range:\n good_step = step\n step = step * 10\n -\n \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 # now going to first good step\n modul = axis_start % good_step\n @@ -387,7 +381,10 @@ else:\n \n # iterating and adding each value\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 \n return delimiter_list\n diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 0a1b63de8b..ac471d3ba0 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -353 \ No newline at end of file +355 \ No newline at end of file -- 2.30.9