Skip to content

Commit 4c36359

Browse files
pbhatt17pbhatt17
authored
Merge pull request #141 from Zolon-DOL/master
Sprint 4 changes
2 parents f93624e + d58874d commit 4c36359

File tree

13 files changed

+2306
-1856
lines changed

13 files changed

+2306
-1856
lines changed

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎Child Labor.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
067E52F0269F31AD006924B0 /* icons_Polysilicon-33@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 067E52ED269F31AD006924B0 /* icons_Polysilicon-33@3x.png */; };
1616
067E52F1269F31AD006924B0 /* icons_Polysilicon-33@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 067E52EE269F31AD006924B0 /* icons_Polysilicon-33@2x.png */; };
1717
06CB3B4E2684C20900D489F9 /* ILABProjectsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06CB3B4D2684C20900D489F9 /* ILABProjectsController.swift */; };
18+
06FDBA0926C17E6E0059FDA3 /* Gambia, The.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 06FDBA0826C17E6E0059FDA3 /* Gambia, The.pdf */; };
1819
1022CD62252C9AC40098C1A8 /* TDA-foreword-2019.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 1022CD61252C9AC40098C1A8 /* TDA-foreword-2019.pdf */; };
1920
1022CD64252C9E770098C1A8 /* 2019_Sweat_And_Toil_Magazine.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 1022CD63252C9E770098C1A8 /* 2019_Sweat_And_Toil_Magazine.pdf */; };
2021
139AC81D2332509A002420FF /* North_Macedonia-map.png in Resources */ = {isa = PBXBuildFile; fileRef = 139AC8122332509A002420FF /* North_Macedonia-map.png */; };
@@ -625,7 +626,6 @@
625626
8356184B1BD7DE79007BCF75 /* Falkland Islands (Islas Malvinas).pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617C21BD7DE78007BCF75 /* Falkland Islands (Islas Malvinas).pdf */; };
626627
8356184C1BD7DE79007BCF75 /* Fiji.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617C31BD7DE78007BCF75 /* Fiji.pdf */; };
627628
8356184D1BD7DE79007BCF75 /* Gabon.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617C41BD7DE78007BCF75 /* Gabon.pdf */; };
628-
8356184E1BD7DE79007BCF75 /* Gambia.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617C51BD7DE78007BCF75 /* Gambia.pdf */; };
629629
8356184F1BD7DE79007BCF75 /* Georgia.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617C61BD7DE78007BCF75 /* Georgia.pdf */; };
630630
835618501BD7DE79007BCF75 /* Ghana.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617C71BD7DE78007BCF75 /* Ghana.pdf */; };
631631
835618511BD7DE79007BCF75 /* Grenada.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617C81BD7DE78007BCF75 /* Grenada.pdf */; };
@@ -1110,6 +1110,7 @@
11101110
067E52ED269F31AD006924B0 /* icons_Polysilicon-33@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icons_Polysilicon-33@3x.png"; sourceTree = "<group>"; };
11111111
067E52EE269F31AD006924B0 /* icons_Polysilicon-33@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icons_Polysilicon-33@2x.png"; sourceTree = "<group>"; };
11121112
06CB3B4D2684C20900D489F9 /* ILABProjectsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ILABProjectsController.swift; sourceTree = "<group>"; };
1113+
06FDBA0826C17E6E0059FDA3 /* Gambia, The.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Gambia, The.pdf"; sourceTree = "<group>"; };
11131114
1022CD61252C9AC40098C1A8 /* TDA-foreword-2019.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "TDA-foreword-2019.pdf"; sourceTree = "<group>"; };
11141115
1022CD63252C9E770098C1A8 /* 2019_Sweat_And_Toil_Magazine.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 2019_Sweat_And_Toil_Magazine.pdf; sourceTree = "<group>"; };
11151116
139AC8122332509A002420FF /* North_Macedonia-map.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "North_Macedonia-map.png"; sourceTree = "<group>"; };
@@ -1720,7 +1721,6 @@
17201721
835617C21BD7DE78007BCF75 /* Falkland Islands (Islas Malvinas).pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Falkland Islands (Islas Malvinas).pdf"; sourceTree = "<group>"; };
17211722
835617C31BD7DE78007BCF75 /* Fiji.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Fiji.pdf; sourceTree = "<group>"; };
17221723
835617C41BD7DE78007BCF75 /* Gabon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Gabon.pdf; sourceTree = "<group>"; };
1723-
835617C51BD7DE78007BCF75 /* Gambia.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Gambia.pdf; sourceTree = "<group>"; };
17241724
835617C61BD7DE78007BCF75 /* Georgia.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Georgia.pdf; sourceTree = "<group>"; };
17251725
835617C71BD7DE78007BCF75 /* Ghana.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Ghana.pdf; sourceTree = "<group>"; };
17261726
835617C81BD7DE78007BCF75 /* Grenada.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Grenada.pdf; sourceTree = "<group>"; };
@@ -3104,6 +3104,7 @@
31043104
835D026E1BBAF1A10048657F /* Full Reports */ = {
31053105
isa = PBXGroup;
31063106
children = (
3107+
06FDBA0826C17E6E0059FDA3 /* Gambia, The.pdf */,
31073108
835617961BD7DE78007BCF75 /* Afghanistan.pdf */,
31083109
835617971BD7DE78007BCF75 /* Albania.pdf */,
31093110
835617981BD7DE78007BCF75 /* Algeria.pdf */,
@@ -3154,7 +3155,6 @@
31543155
835617C21BD7DE78007BCF75 /* Falkland Islands (Islas Malvinas).pdf */,
31553156
835617C31BD7DE78007BCF75 /* Fiji.pdf */,
31563157
835617C41BD7DE78007BCF75 /* Gabon.pdf */,
3157-
835617C51BD7DE78007BCF75 /* Gambia.pdf */,
31583158
835617C61BD7DE78007BCF75 /* Georgia.pdf */,
31593159
835617C71BD7DE78007BCF75 /* Ghana.pdf */,
31603160
835617C81BD7DE78007BCF75 /* Grenada.pdf */,
@@ -4011,6 +4011,7 @@
40114011
8310FE891ABB11310025F7AE /* Botswana.png in Resources */,
40124012
8310FE791ABB11310025F7AE /* Aruba.png in Resources */,
40134013
8303DF791B41F21A00E4FD42 /* Colombia-map.png in Resources */,
4014+
06FDBA0926C17E6E0059FDA3 /* Gambia, The.pdf in Resources */,
40144015
6682424A24E70BB1009B203E /* icons_Hair_Products-33@3x.png in Resources */,
40154016
8310FF131ABB11310025F7AE /* Rwanda.png in Resources */,
40164017
8356182B1BD7DE79007BCF75 /* Benin.pdf in Resources */,
@@ -4429,7 +4430,6 @@
44294430
8356181F1BD7DE79007BCF75 /* Afghanistan.pdf in Resources */,
44304431
8335AF401B667963000748F0 /* icons_Footwear_(sandals).png in Resources */,
44314432
8310FEF91ABB11310025F7AE /* Netherlands_Antilles.png in Resources */,
4432-
8356184E1BD7DE79007BCF75 /* Gambia.pdf in Resources */,
44334433
8310FF4A1ABB11310025F7AE /* Vietnam.png in Resources */,
44344434
139AC81F2332509A002420FF /* Moldova-map.png in Resources */,
44354435
EDE89EA121383D9000A70A00 /* icons_Lettuce-33@3x.png in Resources */,

‎Child Labor.xcodeproj/project.xcworkspace/xcuserdata/gnanendrakumar.xcuserdatad/UserInterfaceState.xcuserstate‎

31.1 KB
Binary file not shown.

‎Child Labor.xcodeproj/project.xcworkspace/xcuserdata/praveenbhatt.xcuserdatad/UserInterfaceState.xcuserstate‎

3.53 KB
Binary file not shown.

‎Child Labor.xcodeproj/xcuserdata/gnanendrakumar.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 113 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
99
<BreakpointContent
1010
uuid = "E1BEDC6F-919E-44E0-BB06-886831531F89"
11-
shouldBeEnabled = "No"
11+
shouldBeEnabled = "Yes"
1212
ignoreCount = "0"
1313
continueAfterRunningActions = "No"
1414
filePath = "Child Labor/CountryController.swift"
@@ -68,5 +68,117 @@
6868
landmarkType = "7">
6969
</BreakpointContent>
7070
</BreakpointProxy>
71+
<BreakpointProxy
72+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
73+
<BreakpointContent
74+
uuid = "D02145DC-F487-4ECA-A2BC-D878FD89560B"
75+
shouldBeEnabled = "Yes"
76+
ignoreCount = "0"
77+
continueAfterRunningActions = "No"
78+
filePath = "Child Labor/EnforcementMultiTableViewController.swift"
79+
startingColumnNumber = "9223372036854775807"
80+
endingColumnNumber = "9223372036854775807"
81+
startingLineNumber = "225"
82+
endingLineNumber = "225"
83+
landmarkName = "tableView(_:cellForRowAt:)"
84+
landmarkType = "7">
85+
</BreakpointContent>
86+
</BreakpointProxy>
87+
<BreakpointProxy
88+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
89+
<BreakpointContent
90+
uuid = "14FEF8CB-07E5-4AAE-9BB6-6009F7F73445"
91+
shouldBeEnabled = "Yes"
92+
ignoreCount = "0"
93+
continueAfterRunningActions = "No"
94+
filePath = "Child Labor/EnforcementMultiTableViewController.swift"
95+
startingColumnNumber = "9223372036854775807"
96+
endingColumnNumber = "9223372036854775807"
97+
startingLineNumber = "224"
98+
endingLineNumber = "224"
99+
landmarkName = "tableView(_:cellForRowAt:)"
100+
landmarkType = "7">
101+
</BreakpointContent>
102+
</BreakpointProxy>
103+
<BreakpointProxy
104+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
105+
<BreakpointContent
106+
uuid = "1D52A95A-E4FC-474F-B8B0-E0C24CB0DF22"
107+
shouldBeEnabled = "Yes"
108+
ignoreCount = "0"
109+
continueAfterRunningActions = "No"
110+
filePath = "Child Labor/EnforcementTableViewController.swift"
111+
startingColumnNumber = "9223372036854775807"
112+
endingColumnNumber = "9223372036854775807"
113+
startingLineNumber = "30"
114+
endingLineNumber = "30"
115+
landmarkName = "viewDidLoad()"
116+
landmarkType = "7">
117+
</BreakpointContent>
118+
</BreakpointProxy>
119+
<BreakpointProxy
120+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
121+
<BreakpointContent
122+
uuid = "46C15600-1726-4C37-98CD-E5EA3E289DD5"
123+
shouldBeEnabled = "Yes"
124+
ignoreCount = "0"
125+
continueAfterRunningActions = "No"
126+
filePath = "Child Labor/EnforcementMultiTableViewController.swift"
127+
startingColumnNumber = "9223372036854775807"
128+
endingColumnNumber = "9223372036854775807"
129+
startingLineNumber = "28"
130+
endingLineNumber = "28"
131+
landmarkName = "viewDidLoad()"
132+
landmarkType = "7">
133+
</BreakpointContent>
134+
</BreakpointProxy>
135+
<BreakpointProxy
136+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
137+
<BreakpointContent
138+
uuid = "1E309AE4-43F1-40D9-931E-C783721D0193"
139+
shouldBeEnabled = "Yes"
140+
ignoreCount = "0"
141+
continueAfterRunningActions = "No"
142+
filePath = "Child Labor/CountriesTableViewController.swift"
143+
startingColumnNumber = "9223372036854775807"
144+
endingColumnNumber = "9223372036854775807"
145+
startingLineNumber = "116"
146+
endingLineNumber = "116"
147+
landmarkName = "viewDidLoad()"
148+
landmarkType = "7">
149+
</BreakpointContent>
150+
</BreakpointProxy>
151+
<BreakpointProxy
152+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
153+
<BreakpointContent
154+
uuid = "44AFCD77-9D65-4723-8094-EA3C53A73FB2"
155+
shouldBeEnabled = "No"
156+
ignoreCount = "0"
157+
continueAfterRunningActions = "No"
158+
filePath = "Child Labor/EnforceTableViewController.swift"
159+
startingColumnNumber = "9223372036854775807"
160+
endingColumnNumber = "9223372036854775807"
161+
startingLineNumber = "123"
162+
endingLineNumber = "123"
163+
landmarkName = "setEnforcement(_:text:)"
164+
landmarkType = "7">
165+
</BreakpointContent>
166+
</BreakpointProxy>
167+
<BreakpointProxy
168+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
169+
<BreakpointContent
170+
uuid = "899FF20E-51E0-4DC3-9511-DFDA7483D45F"
171+
shouldBeEnabled = "No"
172+
ignoreCount = "0"
173+
continueAfterRunningActions = "No"
174+
filePath = "Child Labor/EnforceTableViewController.swift"
175+
startingColumnNumber = "9223372036854775807"
176+
endingColumnNumber = "9223372036854775807"
177+
startingLineNumber = "110"
178+
endingLineNumber = "110"
179+
landmarkName = "viewDidLoad()"
180+
landmarkType = "7">
181+
</BreakpointContent>
182+
</BreakpointProxy>
71183
</Breakpoints>
72184
</Bucket>

0 commit comments

Comments
 (0)