test/TaskTest.m @@ -11,6 +11,7 @@ 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; + B904056B0FA82E1B00DEA392 /* RTMObject.m in Sources */ = {isa = PBXBuildFile; fileRef = B91C48AA0FA04BD5001032CD /* RTMObject.m */; }; B910D96F0FA1E5760051EFB0 /* DBTaskProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B9D043420F5F49A900641E61 /* DBTaskProvider.m */; }; B914B2D70F5E7D6E009C19BE /* RTMList.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160F210F565D4C00473A95 /* RTMList.m */; }; B914B30F0F5EBAC6009C19BE /* ListProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = B9D1200A0F56A97B00B5ABA4 /* ListProvider.m */; }; @@ -98,7 +99,7 @@ B95C5C090F598C8400A368DC /* rtm.sql in Resources */ = {isa = PBXBuildFile; fileRef = B95C5C070F598C8400A368DC /* rtm.sql */; }; B970AC060F6416A1004467E9 /* TaskView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B970AC050F6416A1004467E9 /* TaskView.xib */; }; B971DBDE0F5CCA3000513D03 /* LocalCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160F1D0F565D4C00473A95 /* LocalCache.m */; }; - B97AA00C0F9FEA1C004A23E3 /* RTMTaskTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160FE10F565DE000473A95 /* RTMTaskTest.m */; }; + B97AA00C0F9FEA1C004A23E3 /* TaskTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B9160FE10F565DE000473A95 /* TaskTest.m */; }; B97F4FF00F94A1260085FB9B /* TaskCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = B97F4FEF0F94A1260085FB9B /* TaskCollection.m */; }; B97F4FF10F94A1260085FB9B /* TaskCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = B97F4FEF0F94A1260085FB9B /* TaskCollection.m */; }; B97F4FF80F94A1D90085FB9B /* TaskCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B97F4FF70F94A1D90085FB9B /* TaskCollectionViewController.m */; }; @@ -375,7 +376,7 @@ B9160FDE0F565DE000473A95 /* RTMPendingTaskTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTMPendingTaskTest.m; sourceTree = "<group>"; }; B9160FDF0F565DE000473A95 /* RTMSynchronizerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTMSynchronizerTest.m; sourceTree = "<group>"; }; B9160FE00F565DE000473A95 /* RTMTaskEntryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTMTaskEntryTest.m; sourceTree = "<group>"; }; - B9160FE10F565DE000473A95 /* RTMTaskTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTMTaskTest.m; sourceTree = "<group>"; }; + B9160FE10F565DE000473A95 /* TaskTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskTest.m; sourceTree = "<group>"; }; B9160FE20F565DE000473A95 /* UpdateList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UpdateList.m; sourceTree = "<group>"; }; B9160FE30F565DE000473A95 /* UpdateTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UpdateTask.m; sourceTree = "<group>"; }; B9160FF70F565E8000473A95 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; @@ -747,8 +748,9 @@ B9AE52090F6B408A0076D258 /* api */, B91610590F56607600473A95 /* mock */, B9160FDD0F565DE000473A95 /* ListTest.m */, - B9B957310F66160B0046712A /* TagProviderTest.m */, + B9160FE10F565DE000473A95 /* TaskTest.m */, B9D043370F5F48C800641E61 /* TaskProviderTest.m */, + B9B957310F66160B0046712A /* TagProviderTest.m */, B9160FB70F565DB600473A95 /* FunctionalTestProgressViewWindow.xib */, B9160FD10F565DE000473A95 /* FunctionalTestAppDelegate.h */, B9160FD20F565DE000473A95 /* FunctionalTestAppDelegate.m */, @@ -757,7 +759,6 @@ B9160FDC0F565DE000473A95 /* LocalCacheTest.m */, B9160FDE0F565DE000473A95 /* RTMPendingTaskTest.m */, B9160FE00F565DE000473A95 /* RTMTaskEntryTest.m */, - B9160FE10F565DE000473A95 /* RTMTaskTest.m */, B9160FE20F565DE000473A95 /* UpdateList.m */, B9160FE30F565DE000473A95 /* UpdateTask.m */, B9160FDF0F565DE000473A95 /* RTMSynchronizerTest.m */, @@ -1348,6 +1349,7 @@ B97F4FF00F94A1260085FB9B /* TaskCollection.m in Sources */, B97F4FF90F94A1D90085FB9B /* TaskCollectionViewController.m in Sources */, B97F500E0F94C9280085FB9B /* RTMTaskCell.m in Sources */, + B904056B0FA82E1B00DEA392 /* RTMObject.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1419,7 +1421,7 @@ files = ( B9D043470F5F49CF00641E61 /* RTMTask.m in Sources */, B9B956E00F6609FA0046712A /* MilponHelper.m in Sources */, - B97AA00C0F9FEA1C004A23E3 /* RTMTaskTest.m in Sources */, + B97AA00C0F9FEA1C004A23E3 /* TaskTest.m in Sources */, B91C48560FA04319001032CD /* LocalCache.m in Sources */, B91C48740FA04970001032CD /* TaskProvider.m in Sources */, B91C48AB0FA04BD5001032CD /* RTMObject.m in Sources */, Milpon.xcodeproj/project.pbxproj @@ -38,27 +38,21 @@ #pragma mark properties -/* @property (nonatomic, retain) NSNumber *task_id; -*/ @property (nonatomic, assign) NSDate *due; @property (nonatomic, assign) NSNumber *priority; @property (nonatomic, assign) NSDate *completed; -/* @property (nonatomic, retain) NSNumber *postponed; @property (nonatomic, retain) NSString *estimate; @property (nonatomic, retain) NSNumber *has_due_time; - @property (nonatomic, retain) NSNumber *taskseries_id; @property (nonatomic, retain) NSString *name; @property (nonatomic, retain) NSString *url; @property (nonatomic, retain) NSNumber *location_id; @property (nonatomic, retain) NSNumber *list_id; @property (nonatomic, retain) NSString *rrule; - @property (nonatomic, retain) NSArray *tags; @property (nonatomic, retain) NSArray *notes; -*/ #pragma mark methods - (BOOL) is_completed; @@ -81,6 +75,8 @@ enum task_edit_bits_t { EB_TASK_LIST_ID = 1 << 9, EB_TASK_RRULE = 1 << 10, EB_TASK_NOTE = 1 << 11, + EB_TASK_TASKSERIES_ID = 1 << 12, + EB_TASK_TASK_ID = 1 << 13 }; @end \ No newline at end of file model/RTMTask.h @@ -23,13 +23,20 @@ - (BOOL) is_completed { - return [attrs_ objectForKey:@"task.completed"] != nil; + MilponHelper *mh = [MilponHelper sharedHelper]; + return ![[attrs_ objectForKey:@"task.completed"] isEqualToDate:[mh invalidDate]]; } +DEFINE_ATTRIBUTE(task_id, Task_id, NSNumber*, EB_TASK_TASK_ID); DEFINE_ATTRIBUTE(priority, Priority, NSNumber*, EB_TASK_PRIORITY); DEFINE_ATTRIBUTE(due, Due, NSDate*, EB_TASK_DUE); DEFINE_ATTRIBUTE(completed, Completed, NSDate*, EB_TASK_COMPLETED); - +DEFINE_ATTRIBUTE(list_id, List_id, NSNumber*, EB_TASK_LIST_ID); +DEFINE_ATTRIBUTE(taskseries_id, Taskseries_id, NSNumber*, EB_TASK_TASKSERIES_ID); +DEFINE_ATTRIBUTE(name, Name, NSString*, EB_TASK_NAME); +DEFINE_ATTRIBUTE(url, Url, NSString*, EB_TASK_URL); +DEFINE_ATTRIBUTE(location_id, Location_id, NSNumber*, EB_TASK_LOCACTION_ID); +DEFINE_ATTRIBUTE(estimate, Estimate, NSString*, EB_TASK_ESTIMATE); - (void) setNote:(NSString *)note ofIndex:(NSInteger) index { model/RTMTask.m @@ -16,7 +16,7 @@ #pragma mark Task Collectors - (NSArray *) tasks; - (NSArray *) tasksInList:(NSInteger) list_id; -//- (NSArray *) tasksInTag:(RTMTag *)tag; +- (NSArray *) tasksInTag:(RTMTag *)tag; //- (NSArray *) modifiedTasks; //- (NSArray *) pendingTasks; //- (NSArray *) existingTasks; model/TaskProvider.h test/RTMTaskTest.m cfa7060b7649c98e5979f16a216eb417cb152659 mootoh mootoh@gmail.com http://github.com/mootoh/milpon/commit/2f69a6da3160f028131f95c2ab1178163b403688 2f69a6da3160f028131f95c2ab1178163b403688 2009-04-29T00:59:49-07:00 2009-04-29T00:59:49-07:00 overview works fine. cedeb1924a97fb5cbd35ef57dc09c9080081e3ad mootoh mootoh@gmail.com