is a branch of the "traditional" OpenGroupware collaboration system (developed in Objective-C on SOPE). Release candidate.
| SkyMonthRepetition.m (opengroupware-5.5rc2) | : | SkyMonthRepetition.m (opengroupware-5.5rc3) |
|---|
| | |
| skipping to change at line 261 | | skipping to change at line 261 |
|---|
| NSEnumerator *queryE; | | NSEnumerator *queryE; |
| NSString *orient; | | NSString *orient; |
| // only query mode .. no value setting | | // only query mode .. no value setting |
| [_ctx takeValue: | | [_ctx takeValue: |
| [NSDictionary dictionaryWithObjectsAndKeys: | | [NSDictionary dictionaryWithObjectsAndKeys: |
| [NSMutableArray array], | | [NSMutableArray array], |
| @"query", nil] | | @"query", nil] |
| forKey:@"SkyMonthRepetition"]; | | forKey:@"SkyMonthRepetition"]; |
| [self->template appendToResponse:_response inContext:_ctx]; | | [self->template appendToResponse:_response inContext:_ctx]; |
| | |
|
| queryE = [[[_ctx valueForKey:@"SkyMonthRepetition"] valueForKey:@"query"] | | queryE = [[[_ctx objectForKey:@"SkyMonthRepetition"] objectForKey:@"query"] |
| objectEnumerator]; | | objectEnumerator]; |
| | |
| while ((orient = [queryE nextObject]) != nil) { | | while ((orient = [queryE nextObject]) != nil) { |
| if ((!hasHeader) && ([orient isEqualToString:@"header"])) | | if ((!hasHeader) && ([orient isEqualToString:@"header"])) |
| hasHeader = YES; | | hasHeader = YES; |
| if ((!hasCell) && ([orient isEqualToString:@"cell"])) | | if ((!hasCell) && ([orient isEqualToString:@"cell"])) |
| hasCell = YES; | | hasCell = YES; |
| if ((!hasLeftTop) && ([orient isEqualToString:@"left/top"])) | | if ((!hasLeftTop) && ([orient isEqualToString:@"left/top"])) |
| hasLeftTop = YES; | | hasLeftTop = YES; |
| if ((!hasLeftBottom) && ([orient isEqualToString:@"left/bottom"])) | | if ((!hasLeftBottom) && ([orient isEqualToString:@"left/bottom"])) |
| | |
| skipping to change at line 602 | | skipping to change at line 602 |
|---|
| | |
| - (void)takeValuesFromRequest:(WORequest *)_req inContext:(WOContext *)_ctx { | | - (void)takeValuesFromRequest:(WORequest *)_req inContext:(WOContext *)_ctx { |
| id tmp; | | id tmp; |
| NSDictionary *op; | | NSDictionary *op; |
| NSString *orient; | | NSString *orient; |
| BOOL isEdge; | | BOOL isEdge; |
| | |
| orient = [self->orientation valueInComponent:[_ctx component]]; | | orient = [self->orientation valueInComponent:[_ctx component]]; |
| isEdge = [orient rangeOfString:@"/"].length > 0; | | isEdge = [orient rangeOfString:@"/"].length > 0; |
| | |
|
| op = [_ctx valueForKey:@"SkyMonthRepetition"]; | | op = [_ctx objectForKey:@"SkyMonthRepetition"]; |
| if ((tmp = [op objectForKey:orient]) == nil) | | if ((tmp = [op objectForKey:orient]) == nil) |
| return; | | return; |
| | |
| if (!isEdge) { | | if (!isEdge) { |
| [_ctx appendElementIDComponent:orient]; | | [_ctx appendElementIDComponent:orient]; |
| [self->template takeValuesFromRequest:_req inContext:_ctx]; | | [self->template takeValuesFromRequest:_req inContext:_ctx]; |
| [_ctx deleteLastElementIDComponent]; | | [_ctx deleteLastElementIDComponent]; |
| } | | } |
| else | | else |
| [self->template takeValuesFromRequest:_req inContext:_ctx]; | | [self->template takeValuesFromRequest:_req inContext:_ctx]; |
| | |
| skipping to change at line 625 | | skipping to change at line 625 |
|---|
| - (id)invokeActionForRequest:(WORequest *)_req inContext:(WOContext *)_ctx { | | - (id)invokeActionForRequest:(WORequest *)_req inContext:(WOContext *)_ctx { |
| id tmp; | | id tmp; |
| NSDictionary *op; | | NSDictionary *op; |
| NSString *orient; | | NSString *orient; |
| BOOL isEdge; | | BOOL isEdge; |
| id result; | | id result; |
| | |
| orient = [self->orientation valueInComponent:[_ctx component]]; | | orient = [self->orientation valueInComponent:[_ctx component]]; |
| isEdge = [orient rangeOfString:@"/"].length > 0; | | isEdge = [orient rangeOfString:@"/"].length > 0; |
| | |
|
| op = [_ctx valueForKey:@"SkyMonthRepetition"]; | | op = [_ctx objectForKey:@"SkyMonthRepetition"]; |
| if ((tmp = [op objectForKey:orient]) == nil) | | if ((tmp = [op objectForKey:orient]) == nil) |
| return nil; | | return nil; |
| | |
| if (isEdge) | | if (isEdge) |
| return [self->template invokeActionForRequest:_req inContext:_ctx]; | | return [self->template invokeActionForRequest:_req inContext:_ctx]; |
| | |
| tmp = [_ctx currentElementID]; | | tmp = [_ctx currentElementID]; |
| [_ctx consumeElementID]; | | [_ctx consumeElementID]; |
| [_ctx appendElementIDComponent:tmp]; | | [_ctx appendElementIDComponent:tmp]; |
| | |
| | |
| skipping to change at line 666 | | skipping to change at line 666 |
|---|
| - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx { | | - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx { |
| NSDictionary *op; | | NSDictionary *op; |
| id tmp; | | id tmp; |
| NSString *orient; | | NSString *orient; |
| BOOL isEdge; | | BOOL isEdge; |
| int cols = -1; | | int cols = -1; |
| | |
| orient = [self->orientation valueInComponent:[_ctx component]]; | | orient = [self->orientation valueInComponent:[_ctx component]]; |
| isEdge = [orient rangeOfString:@"/"].length > 0; | | isEdge = [orient rangeOfString:@"/"].length > 0; |
| | |
|
| op = [_ctx valueForKey:@"SkyMonthRepetition"]; | | op = [_ctx objectForKey:@"SkyMonthRepetition"]; |
| if ((tmp = [op objectForKey:@"query"])) { | | if ((tmp = [op objectForKey:@"query"])) { |
| [tmp addObject:orient]; | | [tmp addObject:orient]; |
| } | | } |
| else if ((tmp = [op objectForKey:orient])) { | | else if ((tmp = [op objectForKey:orient])) { |
| if (!isEdge) { | | if (!isEdge) { |
| if ([orient isEqualToString:@"top"] || | | if ([orient isEqualToString:@"top"] || |
| [orient isEqualToString:@"bottom"]) { | | [orient isEqualToString:@"bottom"]) { |
| [self->dayOfWeek setIntValue:[tmp intValue] | | [self->dayOfWeek setIntValue:[tmp intValue] |
| inComponent:[_ctx component]]; | | inComponent:[_ctx component]]; |
| } | | } |
| | |
| skipping to change at line 738 | | skipping to change at line 738 |
|---|
| [self->template release]; | | [self->template release]; |
| [super dealloc]; | | [super dealloc]; |
| } | | } |
| | |
| /* processing requests */ | | /* processing requests */ |
| | |
| - (void)takeValuesFromRequest:(WORequest *)_req inContext:(WOContext *)_ctx { | | - (void)takeValuesFromRequest:(WORequest *)_req inContext:(WOContext *)_ctx { |
| NSDictionary *op; | | NSDictionary *op; |
| id tmp; | | id tmp; |
| | |
|
| op = [_ctx valueForKey:@"SkyMonthRepetition"]; | | op = [_ctx objectForKey:@"SkyMonthRepetition"]; |
| if ((tmp = [op objectForKey:@"cell"]) != nil) | | if ((tmp = [op objectForKey:@"cell"]) != nil) |
| [self->template takeValuesFromRequest:_req inContext:_ctx]; | | [self->template takeValuesFromRequest:_req inContext:_ctx]; |
| } | | } |
| | |
| - (id)invokeActionForRequest:(WORequest *)_req inContext:(WOContext *)_ctx { | | - (id)invokeActionForRequest:(WORequest *)_req inContext:(WOContext *)_ctx { |
| NSDictionary *op; | | NSDictionary *op; |
| id tmp; | | id tmp; |
| | |
|
| op = [_ctx valueForKey:@"SkyMonthRepetition"]; | | op = [_ctx objectForKey:@"SkyMonthRepetition"]; |
| if ((tmp = [op objectForKey:@"cell"]) == nil) | | if ((tmp = [op objectForKey:@"cell"]) == nil) |
| return nil; | | return nil; |
| | |
| return [self->template invokeActionForRequest:_req inContext:_ctx]; | | return [self->template invokeActionForRequest:_req inContext:_ctx]; |
| } | | } |
| | |
| /* generating response */ | | /* generating response */ |
| | |
| - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx { | | - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx { |
| NSDictionary *op; | | NSDictionary *op; |
| id tmp; | | id tmp; |
| | |
|
| op = [_ctx valueForKey:@"SkyMonthRepetition"]; | | op = [_ctx objectForKey:@"SkyMonthRepetition"]; |
| if ((tmp = [op objectForKey:@"query"])) { | | if ((tmp = [op objectForKey:@"query"])) { |
| [tmp addObject:@"cell"]; | | [tmp addObject:@"cell"]; |
| return; | | return; |
| } | | } |
| | |
| if ((tmp = [op objectForKey:@"cell"])) { | | if ((tmp = [op objectForKey:@"cell"])) { |
| // append table date, forwarding extra attributes | | // append table date, forwarding extra attributes |
| [_response appendContentString:@"<td"]; | | [_response appendContentString:@"<td"]; |
| [self appendExtraAttributesToResponse:_response inContext:_ctx]; | | [self appendExtraAttributesToResponse:_response inContext:_ctx]; |
| [_response appendContentString:@">"]; | | [_response appendContentString:@">"]; |
| | | |
| End of changes. 7 change blocks. |
|---|
| 7 lines changed or deleted | | 7 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 