Skip to content

Commit 3077cbc

Browse files
rohitksinghrohitksingh
committedApr 26, 2020
MERGED
2 parents 0a40f68 + 7ad791b commit 3077cbc

File tree

8 files changed

+109
-112
lines changed

8 files changed

+109
-112
lines changed
 

‎Assignment 5/Assignment 5.xcodeproj/xcuserdata/rohit_pc.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
ignoreCount = "0"
1111
continueAfterRunningActions = "No"
1212
filePath = "Assignment 5/Controllers/PlaceListViewContoller.swift"
13-
timestampString = "609557408.341357"
13+
timestampString = "609557813.731011"
1414
startingColumnNumber = "9223372036854775807"
1515
endingColumnNumber = "9223372036854775807"
1616
startingLineNumber = "149"
1717
endingLineNumber = "149"
18-
landmarkName = "syncProgress(connectionSuccess:)"
18+
landmarkName = "syncinit()"
1919
landmarkType = "7">
2020
</BreakpointContent>
2121
</BreakpointProxy>

‎Assignment 5/Assignment 5/Controllers/AddPlaceViewController.swift

+20-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,17 @@ class AddPlaceViewController: UIViewController, DialogCallBack {
3333

3434
var currentPlace = PlaceDescription()
3535

36+
/**********************************************************************************************************************
37+
Life cycle methods
38+
**********************************************************************************************************************/
3639
override func viewDidLoad() {
3740
super.viewDidLoad()
3841

3942
}
4043

44+
/**********************************************************************************************************************
45+
IBAction
46+
**********************************************************************************************************************/
4147
@IBAction func clickMe(_ sender: Any) {
4248
print("This click")
4349
}
@@ -46,6 +52,17 @@ class AddPlaceViewController: UIViewController, DialogCallBack {
4652
Alert.savePlaceAlert(on: self)
4753
}
4854

55+
56+
/**********************************************************************************************************************
57+
Callback methods
58+
**********************************************************************************************************************/
59+
func okButtonCliked() {
60+
performSegue(withIdentifier: "SaveAddPlace", sender: getCurrentPlaceFromUI())
61+
}
62+
63+
/**********************************************************************************************************************
64+
Segue related methods
65+
**********************************************************************************************************************/
4966
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
5067
if(segue.identifier=="SaveAddPlace"){
5168

@@ -54,6 +71,9 @@ class AddPlaceViewController: UIViewController, DialogCallBack {
5471
}
5572
}
5673

74+
/**********************************************************************************************************************
75+
Helper methods
76+
**********************************************************************************************************************/
5777
func getCurrentPlaceFromUI() -> PlaceDescription {
5878
currentPlace.placeName = placeName.text
5979
currentPlace.placeDescription = placeDescription.text
@@ -65,9 +85,4 @@ class AddPlaceViewController: UIViewController, DialogCallBack {
6585
currentPlace.longitude = Double(longitude.text ?? "")
6686
return currentPlace
6787
}
68-
69-
func okButtonCliked() {
70-
performSegue(withIdentifier: "SaveAddPlace", sender: getCurrentPlaceFromUI())
71-
}
72-
7388
}

‎Assignment 5/Assignment 5/Controllers/PlaceDetailViewController.swift

+47-33
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ class PlaceDetailViewController: UIViewController, DialogCallBack, UIPickerViewD
4242
let deleteItemClicked = 0
4343
let modifyItemClicked = 1
4444

45+
/**********************************************************************************************************************
46+
Life cycle methods
47+
**********************************************************************************************************************/
4548
override func viewDidLoad() {
4649
super.viewDidLoad()
4750
setUpUI()
@@ -60,7 +63,9 @@ class PlaceDetailViewController: UIViewController, DialogCallBack, UIPickerViewD
6063
placesPickerView.isHidden = true
6164
}
6265

63-
66+
/**********************************************************************************************************************
67+
IBAction
68+
**********************************************************************************************************************/
6469
@IBAction func onDeleteClicked(_ sender: Any) {
6570

6671
showDeleteAlert(title: "Delete", message: "Do you really want to delete this place?")
@@ -72,17 +77,28 @@ class PlaceDetailViewController: UIViewController, DialogCallBack, UIPickerViewD
7277
Alert.editPlaceAlet(on: self)
7378
}
7479

75-
func showDeleteAlert(title: String, message: String){
80+
81+
@IBAction func pickPlaceButtonClicked(_ sender: Any) {
82+
placesPickerView.isHidden = false
83+
}
84+
85+
/**********************************************************************************************************************
86+
Callback methods
87+
**********************************************************************************************************************/
88+
func okButtonCliked() {
7689

77-
menuItemClicked = deleteItemClicked
78-
Alert.deletePlaceAlert(on: self)
79-
90+
if(menuItemClicked == deleteItemClicked){
91+
deletethePlace()
92+
}else if(menuItemClicked == modifyItemClicked){
93+
modifyPlace()
94+
}
8095
}
8196

97+
/**********************************************************************************************************************
98+
Segue related methods
99+
**********************************************************************************************************************/
82100
func deletethePlace(){
83-
84101
performSegue(withIdentifier: "gobacktoPlaceList", sender: nil)
85-
86102
}
87103

88104
func modifyPlace(){
@@ -96,30 +112,9 @@ class PlaceDetailViewController: UIViewController, DialogCallBack, UIPickerViewD
96112
}
97113
}
98114

99-
func getPlaceFromUI() -> PlaceDescription{
100-
101-
currentPlace?.placeName = placeName.text
102-
currentPlace?.placeDescription = placeDescription.text
103-
currentPlace?.category = category.text
104-
currentPlace?.streetTitle = streetTitle.text
105-
currentPlace?.streetAddress = streetAddress.text
106-
currentPlace?.elevation = Double(elevation.text)
107-
currentPlace?.latitude = Double(latitude.text)
108-
currentPlace?.longitude = Double(longitude.text)
109-
110-
return currentPlace ?? PlaceDescription()
111-
}
112-
113-
func okButtonCliked() {
114-
115-
if(menuItemClicked == deleteItemClicked){
116-
deletethePlace()
117-
}else if(menuItemClicked == modifyItemClicked){
118-
modifyPlace()
119-
}
120-
121-
}
122-
115+
/**********************************************************************************************************************
116+
PickerView methods
117+
**********************************************************************************************************************/
123118
func numberOfComponents(in pickerView: UIPickerView) -> Int {
124119
return 1
125120
}
@@ -143,8 +138,27 @@ class PlaceDetailViewController: UIViewController, DialogCallBack, UIPickerViewD
143138
placesPickerView.isHidden = true
144139
}
145140

146-
@IBAction func pickPlaceButtonClicked(_ sender: Any) {
147-
placesPickerView.isHidden = false
141+
142+
/**********************************************************************************************************************
143+
Helper methods
144+
**********************************************************************************************************************/
145+
func showDeleteAlert(title: String, message: String){
146+
menuItemClicked = deleteItemClicked
147+
Alert.deletePlaceAlert(on: self)
148+
}
149+
150+
func getPlaceFromUI() -> PlaceDescription{
151+
152+
currentPlace?.placeName = placeName.text
153+
currentPlace?.placeDescription = placeDescription.text
154+
currentPlace?.category = category.text
155+
currentPlace?.streetTitle = streetTitle.text
156+
currentPlace?.streetAddress = streetAddress.text
157+
currentPlace?.elevation = Double(elevation.text)
158+
currentPlace?.latitude = Double(latitude.text)
159+
currentPlace?.longitude = Double(longitude.text)
160+
161+
return currentPlace ?? PlaceDescription()
148162
}
149163

150164
}

‎Assignment 5/Assignment 5/Controllers/PlaceListViewContoller.swift

+20-35
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,15 @@ class PlaceListViewController: UITableViewController, ConnectionStatus, ServerCh
2626

2727
var placeselectedIndex = 0
2828
var modifiedPlace = PlaceDescription()
29+
var selectedPlaceName: String?
30+
2931
let db = PlaceDB()
3032
let tempDb = NonSyncPlace()
3133
let initAppData = InitialAppData()
3234

33-
var selectedPlaceName: String?
34-
3535
// This is a check condition for swipe to refresh
3636
var isRefeshing:Bool = false;
3737

38-
3938
/**********************************************************************************************************************
4039
Life cycle methods
4140
**********************************************************************************************************************/
@@ -125,20 +124,29 @@ class PlaceListViewController: UITableViewController, ConnectionStatus, ServerCh
125124

126125
}
127126

128-
129127
func nonSyncPlacesPused() {
130128
print("Non synced places pushed")
131129
PlaceLibrary.allremotePlaces = Array<PlaceDescription>()
132130
db.deleteAllPlaces()
133131
}
134132

133+
func isconnected() {
134+
print("Server Connected")
135+
tempDb.pushPendingToserver(connectionCallback: self)
136+
db.deleteAllPlaces()
137+
PlaceLibrary.loadAllPlacesFromMemory(vc: self)
138+
}
139+
140+
func notconnected() {
141+
print("Server not connected")
142+
syncEnd()
143+
}
144+
135145
/**********************************************************************************************************************
136146
Private helper methods
137147
**********************************************************************************************************************/
138148
@objc private func syncinit() {
139149
isRefeshing = true;
140-
141-
// PlaceLibrary.allremotePlaces = Array<PlaceDescription>()
142150
PlaceLibrary.loadAllPlacesFromMemory(vc: self)
143151
}
144152

@@ -155,6 +163,12 @@ class PlaceListViewController: UITableViewController, ConnectionStatus, ServerCh
155163
refreshList()
156164
}
157165

166+
public func refreshList(){
167+
isRefeshing = false;
168+
self.tableView.reloadData()
169+
self.refreshControl?.endRefreshing()
170+
}
171+
158172
private func addNewPlace(){
159173
PlaceLibrary.allremotePlaces.append(modifiedPlace)
160174
PlaceLibrary.addPlaceOnServer(place: modifiedPlace, connectionCallback: self)
@@ -179,22 +193,13 @@ class PlaceListViewController: UITableViewController, ConnectionStatus, ServerCh
179193
}
180194

181195
private func initDataBase(){
182-
183-
print("AppLoaded ? "+initAppData.ifAppLaunchedFirstTime().description)
184-
185196
if !initAppData.ifAppLaunchedFirstTime(){
186197
initAppData.appLoaded()
187198
db.addPlace(place: initAppData.getInitailData())
188199
}
189200
db.getAllPlacesFromDatabase(vc: self)
190201
}
191202

192-
public func refreshList(){
193-
isRefeshing = false;
194-
self.tableView.reloadData()
195-
self.refreshControl?.endRefreshing()
196-
}
197-
198203
private func setupSwipeToRefersh(){
199204
let refreshControl = UIRefreshControl()
200205
refreshControl.addTarget(self, action: #selector(serverSyncStart), for: .valueChanged)
@@ -213,29 +218,9 @@ class PlaceListViewController: UITableViewController, ConnectionStatus, ServerCh
213218
PlaceLibrary.loadAllPlacesFromMemory(vc:self)
214219
}
215220

216-
217-
218-
219-
220-
221-
//////
222221
@objc private func serverSyncStart(){
223222
isRefeshing = true;
224223
PlaceLibrary.checkServerConnection(connectionCallback: self)
225224
}
226225

227-
func isconnected() {
228-
print("Server Connected")
229-
tempDb.pushPendingToserver(connectionCallback: self)
230-
// PlaceLibrary.allremotePlaces = Array<PlaceDescription>()
231-
db.deleteAllPlaces()
232-
PlaceLibrary.loadAllPlacesFromMemory(vc: self)
233-
234-
}
235-
236-
func notconnected() {
237-
print("Server not connected")
238-
syncEnd()
239-
}
240-
241226
}

‎Assignment 5/Assignment 5/Database/NonSyncPlaceDB.swift

+1-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ class NonSyncPlace{
9090

9191
}
9292

93-
94-
func pushPendingToserver(connectionCallback: ConnectionStatus){
93+
func pushPendingToserver(connectionCallback: ConnectionStatus){
9594

9695
let results = getAllNonSyncState();
9796

‎Assignment 5/Assignment 5/Model/PlaceDescription.swift

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class PlaceDescription {
3232
var latitude: Double?
3333
var longitude: Double?
3434

35-
3635
init() {
3736

3837
}

0 commit comments

Comments
 (0)
Please sign in to comment.