Nextrek
Diff Revisions
587
vs
588
for /iOS/SafariArte/trunk/SafariArte/Controllers/MenuVC/MenuVC.m
|
@@ -237,18 +237,18 @@ |
237 |
237 |
|
if (percorso.routePois ==nil) { |
238 |
238 |
|
|
239 |
239 |
|
} |
240 |
|
- |
else if ( percorso.routePois.count==[[DATAMANAGER poiForRoute:percorso] intValue]) |
241 |
|
- |
{ |
242 |
|
- |
ended++; |
243 |
|
- |
} |
244 |
240 |
|
|
245 |
|
- |
else if ([[DATAMANAGER poiForRoute:percorso] intValue] >0 && [[DATAMANAGER poiForRoute:percorso] intValue]<percorso.routePois.count) |
|
241 |
+ |
else if ([[DATAMANAGER poiForRoute:percorso] intValue] >0 && [[DATAMANAGER poiForRoute:percorso] intValue]<percorso.routePois.count && ([[DATAMANAGER.user.poiForRoute allKeys] containsObject:percorso.routeId])) |
246 |
242 |
|
|
247 |
243 |
|
{ |
248 |
244 |
|
started++; |
249 |
245 |
|
|
250 |
246 |
|
} |
251 |
247 |
|
|
|
248 |
+ |
else if ( percorso.routePois.count==[[DATAMANAGER poiForRoute:percorso] intValue] || ([[DATAMANAGER.user.poiForRoute allKeys] containsObject:percorso.routeId])) |
|
249 |
+ |
{ |
|
250 |
+ |
ended++; |
|
251 |
+ |
} |
252 |
252 |
|
} |
253 |
253 |
|
|
254 |
254 |
|
return [NSString stringWithFormat:NSLocalizedString(@"StartedEndedLabel", nil),started,ended]; |