Changeset 6832
- Timestamp:
- 07/20/12 11:32:01 (11 years ago)
- Location:
- sandbox/2.4.2-expresso1
- Files:
-
- 6 edited
-
expressoCalendar/setup/default_records.inc.php (modified) (1 diff)
-
expressoCalendar/setup/tables_current.inc.php (modified) (2 diffs)
-
expressoCalendar/setup/tables_update.inc.php (modified) (3 diffs)
-
prototype/config/calendarSignature.ini (modified) (1 diff)
-
prototype/modules/calendar/interceptors/DBMapping.php (modified) (3 diffs)
-
prototype/modules/calendar/js/init.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.2-expresso1/expressoCalendar/setup/default_records.inc.php
r5804 r6832 38 38 $oProc->query("ALTER TABLE calendar ALTER COLUMN dtstamp SET DEFAULT (date_part('epoch'::text, ('now'::text)::timestamp(3) with time zone) * (1000)::double precision);"); 39 39 40 $oProc->query("INSERT INTO calendar_object_type( \"id\", \"name\") VALUES ('1','VEVENT');"); 40 $oProc->query("INSERT INTO calendar_object_type( \"id\", \"name\") VALUES ('1','VEVENT');"); 41 $oProc->query("INSERT INTO calendar_object_type( \"id\", \"name\") VALUES ('2','TODO');"); 41 42 $oProc->query("INSERT INTO calendar_class( \"id\", \"name\") VALUES ('1','Public'),('2','Private'),('3','Confidential');"); 42 43 $oProc->query("INSERT INTO calendar_participant_status( \"id\", \"name\") VALUES ('1','CONFIRMED'),('2','TENTATIVE'),('3','CANCELLED'),('4','UNANSWERED'),('5', 'DELEGATED');"); -
sandbox/2.4.2-expresso1/expressoCalendar/setup/tables_current.inc.php
r6114 r6832 48 48 'duration' => array('type' => 'int', 'precision' => '8' ,'nullable' => True), 49 49 'tzid' => array('type' => 'varchar', 'precision' => '50' ,'nullable' => True), 50 'type' => array('type' => 'int', 'precision' => '2' ,'nullable' => false, 'default' => 0), 50 51 'dtstamp' => array('type' => 'int', 'precision' => '8' ,'nullable' => True) 51 52 ), … … 277 278 'msg_alarms' => array( 'type' => 'text', 'nullable' => True), 278 279 'font_color' => array( 'type' => 'varchar','precision' => '6', 'nullable' => True), 279 280 'border_color' => array( 'type' => 'varchar','precision' => '6', 'nullable' => True)281 280 'background_color' => array( 'type' => 'varchar','precision' => '6', 'nullable' => True), 281 'border_color' => array( 'type' => 'varchar','precision' => '6', 'nullable' => True), 282 'type' => array('type' => 'int', 'precision' => '2' ,'nullable' => false, 'default' => 0) 282 283 ), 283 284 'pk' => array('id'), -
sandbox/2.4.2-expresso1/expressoCalendar/setup/tables_update.inc.php
r6797 r6832 57 57 58 58 $oProc->CreateTable('calendar_repeat_ranges', array( 59 60 61 62 63 64 65 66 67 68 69 59 'fd' => array( 60 'id' => array( 'type' => 'auto', 'nullable' => False), 61 'range_start' => array( 'type' => 'bigint','precision' => '16', 'nullable' => False), 62 'range_end' => array( 'type' => 'bigint', 'precision' => '16', 'nullable' => False), 63 'user_info_id' => array( 'type' => 'bigint', 'precision' => '16', 'nullable' => False) 64 ), 65 'pk' => array('id'), 66 'fk' => array(), 67 'ix' => array(), 68 'uc' => array() 69 ) 70 70 ); 71 71 … … 79 79 function expressoCalendar_upgrade1_002() { 80 80 81 81 $oProc = $GLOBALS['phpgw_setup']->oProc; 82 82 83 83 $oProc->query("ALTER TABLE calendar_repeat_occurrence ADD COLUMN exception smallint DEFAULT 0"); 84 84 85 86 85 $GLOBALS['setup_info']['expressoCalendar']['currentver'] = '1.003'; 86 return $GLOBALS['setup_info']['expressoCalendar']['currentver']; 87 87 }; 88 88 89 89 $test[] = '1.003'; 90 90 function expressoCalendar_upgrade1_003() { 91 92 91 $GLOBALS['setup_info']['expressoCalendar']['currentver'] = '1.004'; 92 return $GLOBALS['setup_info']['expressoCalendar']['currentver']; 93 93 }; 94 94 95 95 $test[] = '1.004'; 96 96 function expressoCalendar_upgrade1_004() { 97 98 97 $oProc = $GLOBALS['phpgw_setup']->oProc; 98 $oProc->query("ALTER TABLE calendar_repeat_occurrence ALTER COLUMN exception SET default 0"); 99 99 100 101 100 $GLOBALS['setup_info']['expressoCalendar']['currentver'] = '1.005'; 101 return $GLOBALS['setup_info']['expressoCalendar']['currentver']; 102 102 }; 103 103 104 104 $test[] = '1.005'; 105 105 function expressoCalendar_upgrade1_005() { 106 107 106 $oProc = $GLOBALS['phpgw_setup']->oProc; 107 $oProc->query("ALTER TABLE calendar_alarm ADD COLUMN alarm_offset bigint;"); 108 108 $oProc->query("UPDATE calendar_alarm SET alarm_offset = obj.range_start - calendar_alarm.range_start FROM calendar_object as obj WHERE obj.id = object_id;"); 109 109 $oProc->query("ALTER TABLE calendar_alarm DROP COLUMN range_start;"); 110 110 $oProc->query("ALTER TABLE calendar_alarm DROP COLUMN range_end;"); 111 112 111 $GLOBALS['setup_info']['expressoCalendar']['currentver'] = '1.006'; 112 return $GLOBALS['setup_info']['expressoCalendar']['currentver']; 113 113 }; 114 114 … … 129 129 130 130 $oProc->query("ALTER TABLE calendar ADD COLUMN type smallint DEFAULT 0;"); 131 132 131 $oProc->query("ALTER TABLE calendar_signature ADD COLUMN type smallint DEFAULT 0;"); 132 133 $oProc->query("INSERT INTO calendar_object_type(id, name) VALUES ('2', 'TODO');"); 133 134 134 135 $GLOBALS['setup_info']['expressoCalendar']['currentver'] = '1.008'; -
sandbox/2.4.2-expresso1/prototype/config/calendarSignature.ini
r6797 r6832 13 13 createDefaultSignature = modules/calendar/interceptors/DBMapping.php 14 14 deepnessFindCalendarSignature = modules/calendar/interceptors/DBMapping.php 15 createDefaultGroup = modules/calendar/interceptors/DBMapping.php 15 16 16 17 [after.read] -
sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php
r6797 r6832 925 925 } 926 926 927 928 public function createDefaultGroup(&$uri, &$result, &$criteria, $original) { 929 $existDefaultGroup = false; 930 931 foreach($result as $v){ 932 if($v['type'] == 1 && $v['calendar']['type'] == 1) 933 $existDefaultGroup = true; 934 } 935 936 if(!$existDefaultGroup){ 937 938 $cal = array('name' => 'Sem grupo', 939 'description' => 'Sem grupo', 940 'timezone' => (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo', 941 'dtstamp' => time() . '000', 942 'type' => '1' 943 ); 944 945 $calCreated = Controller::create(array('concept' => 'calendar'), $cal); 946 947 $sig = array('user' => $_SESSION['wallet']['user']['uidNumber'], 948 'calendar' => $calCreated['id'], 949 'isOwner' => '1', 950 'dtstamp' => time() . '000', 951 'fontColor' => 'FFFFFF', 952 'backgroundColor' => '3366CC', 953 'borderColor' => '3366CC', 954 'type' => '1' 955 ); 956 957 $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig); 958 $sigCreated = Controller::read(array('concept' => 'calendarSignature', 'id' => $sigCreated['id']), false, array('deepness' => 2 )); 959 960 array_push($result, $sigCreated); 961 962 963 } 964 965 } 966 927 967 public function createDefaultSignature(&$uri, &$result, &$criteria, $original) { 968 969 if(count($result) == 0 && isset($criteria['filter'][3]) && isset($criteria['filter'][3]['isRecursion'])){ 970 throw new Exception('It was not possible to find to calendar!'); 971 return false; 972 } 928 973 929 974 //Caso uma busca não retorne nenhum resultado e foi buscado pelas assinaturas do usuario logado apenas … … 933 978 if (count($result) > 0) { 934 979 foreach ($result as $value) { 935 if (isset($value['isOwner']) && $value['isOwner'] != 0) 936 $isValidSignature = true; 980 if (isset($value['isOwner']) && $value['isOwner'] != 0) 981 $isValidSignature = true; 982 937 983 } 938 984 } … … 945 991 946 992 if (Config::module('useCaldav', 'expressoCalendar')) { 947 require_once ROOTPATH . '/modules/calendar/interceptors/DAViCalAdapter.php'; 948 949 $calendario = DAViCalAdapter::findCalendars(); 993 require_once ROOTPATH . '/modules/calendar/interceptors/DAViCalAdapter.php'; 994 $calendario = DAViCalAdapter::findCalendars(); 950 995 } 951 996 952 997 if (Config::module('useCaldav', 'expressoCalendar') && is_array($calendario) && count($calendario) > 0) { 953 foreach ($calendario as $i => $v) { 954 955 $urlA = explode('/', $v->url); 956 $name = isset($v->displayname) ? $v->displayname : $urlA[(count($urlA) - 2)]; 957 $cal = array('name' => $name, 958 'description' => isset($v->description) ? $v->description : $name, 959 'timezone' => isset($v->timezone) ? $v->timezone : (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo', 960 'dtstamp' => time() . '000', 961 'location' => $urlA[(count($urlA) - 3)] . '/' . $urlA[(count($urlA) - 2)] 962 ); 963 964 $calCreated = Controller::create(array('concept' => 'calendar'), $cal); 965 966 967 968 $sig = array('user' => $_SESSION['wallet']['user']['uidNumber'], 969 'calendar' => $calCreated['id'], 970 'isOwner' => '1', 971 'dtstamp' => time() . '000', 972 'fontColor' => 'FFFFFF', 973 'backgroundColor' => '3366CC', 974 'borderColor' => '3366CC', 975 ); 976 977 $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig); 978 979 980 DAViCalAdapter::importCollection($v->url, $calCreated['id']); 981 } 998 foreach ($calendario as $i => $v) { 999 1000 $urlA = explode('/', $v->url); 1001 $name = isset($v->displayname) ? $v->displayname : $urlA[(count($urlA) - 2)]; 1002 $cal = array('name' => $name, 1003 'description' => isset($v->description) ? $v->description : $name, 1004 'timezone' => isset($v->timezone) ? $v->timezone : (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo', 1005 'dtstamp' => time() . '000', 1006 'location' => $urlA[(count($urlA) - 3)] . '/' . $urlA[(count($urlA) - 2)] 1007 ); 1008 1009 $calCreated = Controller::create(array('concept' => 'calendar'), $cal); 1010 1011 if(!$calCreated){ 1012 throw new Exception('Error to create calendar'); 1013 return false; 1014 } 1015 1016 $sig = array('user' => $_SESSION['wallet']['user']['uidNumber'], 1017 'calendar' => $calCreated['id'], 1018 'isOwner' => '1', 1019 'dtstamp' => time() . '000', 1020 'fontColor' => 'FFFFFF', 1021 'backgroundColor' => '3366CC', 1022 'borderColor' => '3366CC', 1023 ); 1024 1025 $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig); 1026 1027 if(!$sigCreated){ 1028 throw new Exception('Error to create signature'); 1029 return false; 1030 } 1031 1032 DAViCalAdapter::importCollection($v->url, $calCreated['id']); 1033 } 982 1034 } else { 983 //Criaremos uma agenda padrão 984 $cal = array('name' => 'Calendario', 985 'description' => 'Calendario Padrão', 986 'timezone' => (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo', 987 'dtstamp' => time() . '000' 988 ); 989 990 $calCreated = Controller::create(array('concept' => 'calendar'), $cal); 991 992 $sig = array('user' => $_SESSION['wallet']['user']['uidNumber'], 993 'calendar' => $calCreated['id'], 994 'isOwner' => '1', 995 'dtstamp' => time() . '000', 996 'fontColor' => 'FFFFFF', 997 'backgroundColor' => '3366CC', 998 'borderColor' => '3366CC', 999 ); 1000 1001 $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig); 1002 } 1003 1004 $result = Controller::find($original['URI'], $original['properties'] ? $original['properties'] : null, $original['criteria']); 1035 //Criaremos uma agenda padrão 1036 $cal = array('name' => 'Calendario', 1037 'description' => 'Calendario Padrão', 1038 'timezone' => (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo', 1039 'dtstamp' => time() . '000' 1040 ); 1041 1042 $calCreated = Controller::create(array('concept' => 'calendar'), $cal); 1043 1044 $sig = array('user' => $_SESSION['wallet']['user']['uidNumber'], 1045 'calendar' => $calCreated['id'], 1046 'isOwner' => '1', 1047 'dtstamp' => time() . '000', 1048 'fontColor' => 'FFFFFF', 1049 'backgroundColor' => '3366CC', 1050 'borderColor' => '3366CC', 1051 ); 1052 1053 $sigCreated = Controller::create(array('concept' => 'calendarSignature'), $sig); 1054 } 1055 1056 $original['criteria']['filter'][] = array('isRecursion' => true); 1057 $result = Controller::find($original['URI'], $original['properties'] ? $original['properties'] : null, $original['criteria']); 1005 1058 return false; 1006 }1059 } 1007 1060 } 1008 1061 -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/init.js
r6820 r6832 241 241 allDay: '1' 242 242 }); 243 //DataLayer.commit(); 243 244 $(componente).qtip('destroy'); 244 245 245 246 }); … … 267 268 }); 268 269 269 $('. button').button();270 $('.qtip-active .button').button(); 270 271 271 272 $('div.qtip.qtip-blue.qtip-active').addClass('new-task');
Note: See TracChangeset
for help on using the changeset viewer.
