"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "WebUI/Project/LSWProject/LSWProjectJobList.m" between
opengroupware-5.5rc2.tar.gz and opengroupware-5.5rc3.tar.gz

About: OpenGroupware is a branch of the "traditional" OpenGroupware collaboration system (developed in Objective-C on SOPE). Release candidate.

LSWProjectJobList.m  (opengroupware-5.5rc2)	:	LSWProjectJobList.m  (opengroupware-5.5rc3)
skipping to change at line 382		skipping to change at line 382
}		}
else if ([s intValue] == 0) {		else if ([s intValue] == 0) {
return [l valueForKey:[NSString stringWithFormat:@"no%@Data",		return [l valueForKey:[NSString stringWithFormat:@"no%@Data",
_attr]];		_attr]];
}		}
else {		else {
c = [[[self highestJob] valueForKey:_attr] doubleValue];		c = [[[self highestJob] valueForKey:_attr] doubleValue];
percent = (c / [s doubleValue]) * 100;		percent = (c / [s doubleValue]) * 100;
}		}
return [NSString stringWithFormat:@"%@ %@ %@ %i %@, %.0f %@ (%.0f %%) %@ %@",		return [NSString stringWithFormat:@"%@ %@ %@ %"PRIuPTR" %@, %.0f %@ (%.0f %%) %@ %@",
s, [l valueForKey:_label],		s, [l valueForKey:_label],
[l valueForKey:@"in"], [[self jobs] count],		[l valueForKey:@"in"], [[self jobs] count],
[l valueForKey:@"jobsLabel"], c,		[l valueForKey:@"jobsLabel"], c,
[l valueForKey:_label], percent,		[l valueForKey:_label], percent,
[l valueForKey:@"in"], [l valueForKey:@"jobLabel"]];		[l valueForKey:@"in"], [l valueForKey:@"jobLabel"]];
}		}
- (NSString *)actualWorkString {		- (NSString *)actualWorkString {
return [self stringForAttribute:@"actualWork"		return [self stringForAttribute:@"actualWork"
withUnitLabel:@"minutesLabel"];		withUnitLabel:@"minutesLabel"];
skipping to change at line 424		skipping to change at line 424
return [l valueForKey:@"noJobAssociated"];		return [l valueForKey:@"noJobAssociated"];
}		}
else if ([s intValue] == 0) {		else if ([s intValue] == 0) {
return [l valueForKey:@"nopercentData"];		return [l valueForKey:@"nopercentData"];
}		}
else {		else {
c = [[[self highestJob] valueForKey:@"percentComplete"] doubleValue];		c = [[[self highestJob] valueForKey:@"percentComplete"] doubleValue];
i = [s doubleValue] / [[self jobs] count];		i = [s doubleValue] / [[self jobs] count];
}		}
result = [NSString stringWithFormat:@"%.0f %@ %@ %i %@",		result = [NSString stringWithFormat:@"%.0f %@ %@ %"PRIuPTR" %@",
i, [l valueForKey:@"percent"],		i, [l valueForKey:@"percent"],
[l valueForKey:@"in"], [[self jobs] count],		[l valueForKey:@"in"], [[self jobs] count],
[l valueForKey:@"jobsLabel"]];		[l valueForKey:@"jobsLabel"]];
if (c < 100)		if (c < 100)
return [result stringByAppendingFormat:@", %.0f %@ %@ %@",		return [result stringByAppendingFormat:@", %.0f %@ %@ %@",
c,		c,
[l valueForKey:@"percent"],		[l valueForKey:@"percent"],
[l valueForKey:@"in"], [l valueForKey:@"jobLabel"]];		[l valueForKey:@"in"], [l valueForKey:@"jobLabel"]];
else		else
End of changes. 2 change blocks.
2 lines changed or deleted		2 lines changed or added

---