Skip to content

A
ayudapy
Commit a7fe0af9 by Julio Hermosa
Options

commit final 

se agrega la opción de marcar como listo, pero le faltaría que persistan los cambios
se agregaron constraints de altura para los labels y los botones de la pantalla de detalle de pedido (con valores constantes)
parent 364946d9
Showing with 118 additions and 41 deletions
ayudapy/CoreData/CoreDataManager.swift
...@@ -80,34 +80,54 @@ class CoreDataManager { ...@@ -80,34 +80,54 @@ class CoreDataManager {
return bool return bool
} }
// func saveInCheckedList(id: Int, latitude: Double, longitude: Double, completion: @escaping()-> Void){ func saveInCheckedList(id: Int, latitude: Double, longitude: Double, completion: @escaping()-> Void){
// let context = container.viewContext let context = container.viewContext
// let isCheckedList = IsCheckedList(context: context) let isCheckedList = IsCheckedList(context: context)
// isCheckedList.id = Int64(id)
// } isCheckedList.latitude = latitude
// func fetchCheckedList()->[IsCheckedList]{ isCheckedList.longitude = longitude
// let fetchRequest: NSFetchRequest<IsCheckedList> = IsCheckedList.fetchRequest() do{
// do { try context.save()
// let result = try container.viewContext.fetch(fetchRequest) print("\(id) guardado en listos")
// return result completion()
// }catch{ }catch{
// print("Error al obtener la información de favoritos - \(error)") print("error al guardar \(error)")
// } }
//
// return [] }
// } func fetchCheckedList()->[IsCheckedList]{
// func deleteCheckObject(id: Int, array: [IsCheckedList]){ let fetchRequest: NSFetchRequest<IsCheckedList> = IsCheckedList.fetchRequest()
// let context = container.viewContext do {
// for i in 0..<array.count { let result = try container.viewContext.fetch(fetchRequest)
// if array[i].id == Int64(id){ return result
// context.delete(array[i]) }catch{
// do{ print("Error al obtener la información de favoritos - \(error)")
// try context.save() }
// print("\(id) borrado")
// }catch{ return []
// print("error al borrar \(error)") }
// } func checkReadyList(id: Int, entityList: [IsCheckedList])->Bool{
// } let array = entityList
// } var bool = false
// } for i in 0..<array.count {
if array[i].id == Int64(id){
bool = true
}
}
return bool
}
func deleteCheckObject(id: Int, array: [IsCheckedList]){
let context = container.viewContext
for i in 0..<array.count {
if array[i].id == Int64(id){
context.delete(array[i])
do{
try context.save()
print("\(id) borrado")
}catch{
print("error al borrar \(error)")
}
}
}
}
} }
ayudapy/ViewControllers/MapViewController.swift
...@@ -23,6 +23,7 @@ class MapViewController: UIViewController { ...@@ -23,6 +23,7 @@ class MapViewController: UIViewController {
var bbox = String() var bbox = String()
var id = Int() var id = Int()
var favorites = [Entity]() var favorites = [Entity]()
var checkedList = [IsCheckedList]()
let defaultLocation = CLLocation(latitude: -57.5879897, longitude: -43.2723609) let defaultLocation = CLLocation(latitude: -57.5879897, longitude: -43.2723609)
//-57.5879897,-43.2723609 -> Posición de Roshka //-57.5879897,-43.2723609 -> Posición de Roshka
...@@ -115,7 +116,10 @@ class MapViewController: UIViewController { ...@@ -115,7 +116,10 @@ class MapViewController: UIViewController {
let markerView = UIView(frame: CGRect(x: 0, y: 0, width: 30, height: 35)) let markerView = UIView(frame: CGRect(x: 0, y: 0, width: 30, height: 35))
let markerButton = UIButton(frame: CGRect(x: 0, y: 0, width: 30, height: 35)) let markerButton = UIButton(frame: CGRect(x: 0, y: 0, width: 30, height: 35))
if self.manager.checkData(id: self.id, entityList: self.favorites){ if self.manager.checkData(id: self.id, entityList: self.favorites){
markerButton.setImage(UIImage(named: "pinFavGMAPS"), for: .normal) //markerButton.setImage(UIImage(named: "pinFavGMAPS"), for: .normal)
}
if self.manager.checkReadyList(id: self.id, entityList: self.checkedList){
// markerButton.setImage(UIImage(named: "pinFavGMAPS"), for: .normal)
} }
else { else {
markerButton.setImage(UIImage(named: "pinGMAPS"), for: .normal) markerButton.setImage(UIImage(named: "pinGMAPS"), for: .normal)
...@@ -150,9 +154,24 @@ class MapViewController: UIViewController { ...@@ -150,9 +154,24 @@ class MapViewController: UIViewController {
//Mostramos en el mapa los marcadores de los pedidos guardados en mis pendientes y/o marcados como listo //Mostramos en el mapa los marcadores de los pedidos guardados en mis pendientes y/o marcados como listo
func showFavoritesOrCheckedIcons(){ func showFavoritesOrCheckedIcons(){
let named = "pinFavGMAPS"
favorites = manager.fetchFavorites() favorites = manager.fetchFavorites()
checkedList = manager.fetchCheckedList()
for i in 0 ..< checkedList.count{
let markerView = UIView(frame: CGRect(x: 0, y: 0, width: 30, height: 35))
let markerButton = UIButton(frame: CGRect(x: 0, y: 0, width: 30, height: 35))
let position = CLLocationCoordinate2D(latitude: checkedList[i].latitude, longitude: checkedList[i].longitude)
markerButton.setImage(UIImage(named: "pinCheckedGMAPS"), for: .normal)
markerView.addSubview(markerButton)
let marker = GMSMarker(position: position)
marker.map = self.mapView
marker.iconView = markerView
marker.title = "\(checkedList[i].id)"
}
for i in 0 ..< favorites.count{ for i in 0 ..< favorites.count{
let named = "pinFavGMAPS"
if manager.checkReadyList(id: Int(favorites[i].id), entityList: checkedList) == false {
let markerView = UIView(frame: CGRect(x: 0, y: 0, width: 30, height: 35)) let markerView = UIView(frame: CGRect(x: 0, y: 0, width: 30, height: 35))
let markerButton = UIButton(frame: CGRect(x: 0, y: 0, width: 30, height: 35)) let markerButton = UIButton(frame: CGRect(x: 0, y: 0, width: 30, height: 35))
let position = CLLocationCoordinate2D(latitude: favorites[i].latitude, longitude: favorites[i].longitude) let position = CLLocationCoordinate2D(latitude: favorites[i].latitude, longitude: favorites[i].longitude)
...@@ -162,9 +181,12 @@ class MapViewController: UIViewController { ...@@ -162,9 +181,12 @@ class MapViewController: UIViewController {
marker.map = self.mapView marker.map = self.mapView
marker.iconView = markerView marker.iconView = markerView
marker.title = "\(favorites[i].id)" marker.title = "\(favorites[i].id)"
}
} }
} }
//Selectors //Selectors
@objc func goToInfoVC(){ @objc func goToInfoVC(){
let infoVC = self.storyboard?.instantiateViewController(withIdentifier: "infoVC") as! InfoViewController let infoVC = self.storyboard?.instantiateViewController(withIdentifier: "infoVC") as! InfoViewController
...@@ -190,15 +212,21 @@ class MapViewController: UIViewController { ...@@ -190,15 +212,21 @@ class MapViewController: UIViewController {
requestsVC.isFavorite = true requestsVC.isFavorite = true
print("El pedido\(id) es favorito") print("El pedido\(id) es favorito")
} }
if manager.checkReadyList(id: id, entityList: checkedList){
requestsVC.isChecked = true
print("El pedido\(id) esta marcado como listo")
}
requestsVC.helpRequest() requestsVC.helpRequest()
isModalInPresentation = true isModalInPresentation = true
present(requestsVC, animated: true, completion: nil) show(requestsVC, sender: nil)
//present(requestsVC, animated: true, completion: nil)
} }
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(true) super.viewWillAppear(true)
favorites = manager.fetchFavorites() favorites = manager.fetchFavorites()
print("Estos son los favoritos \(favorites)") checkedList = manager.fetchCheckedList()
helpRequest() helpRequest()
} }
......
ayudapy/ViewControllers/RequestViewController.swift
...@@ -26,9 +26,10 @@ class RequestViewController: UIViewController { ...@@ -26,9 +26,10 @@ class RequestViewController: UIViewController {
var latitude = Double() var latitude = Double()
var format = Format.init() var format = Format.init()
var isFavorite = Bool() var isFavorite = Bool()
var checked = Bool() var isChecked = Bool()
private let manager = CoreDataManager() private let manager = CoreDataManager()
var favorites = [Entity]() var favorites = [Entity]()
var checkedList = [IsCheckedList]()
let isFavoriteButton = UIButton() let isFavoriteButton = UIButton()
let isFavoriteLabel = UILabel() let isFavoriteLabel = UILabel()
...@@ -86,7 +87,6 @@ class RequestViewController: UIViewController { ...@@ -86,7 +87,6 @@ class RequestViewController: UIViewController {
messageLabel.font = format.bodyFontStyle messageLabel.font = format.bodyFontStyle
messageLabel.numberOfLines = .max messageLabel.numberOfLines = .max
messageLabel.lineBreakMode = .byWordWrapping messageLabel.lineBreakMode = .byWordWrapping
//print("ha upei \()")
//messageLabel.sizeToFit() //messageLabel.sizeToFit()
//Para mostrar la imagen en caso de que el campo no sea nulo //Para mostrar la imagen en caso de que el campo no sea nulo
...@@ -96,6 +96,7 @@ class RequestViewController: UIViewController { ...@@ -96,6 +96,7 @@ class RequestViewController: UIViewController {
imageView.widthAnchor.constraint(equalToConstant: view.frame.width * 0.4).isActive = true imageView.widthAnchor.constraint(equalToConstant: view.frame.width * 0.4).isActive = true
imageView.kf.indicatorType = .activity imageView.kf.indicatorType = .activity
imageView.kf.setImage(with: URL(string: imageUrl!.convertURL())) imageView.kf.setImage(with: URL(string: imageUrl!.convertURL()))
imageView.contentMode = .scaleToFill
} }
//Se agrupan las vistas en la cabecera //Se agrupan las vistas en la cabecera
let headerStackView = UIStackView(arrangedSubviews: [dateLabel, titleLbl, messageLabel, imageView]) let headerStackView = UIStackView(arrangedSubviews: [dateLabel, titleLbl, messageLabel, imageView])
...@@ -119,7 +120,7 @@ class RequestViewController: UIViewController { ...@@ -119,7 +120,7 @@ class RequestViewController: UIViewController {
howToGetButton.setTitle("Como llegar", for: .normal) howToGetButton.setTitle("Como llegar", for: .normal)
howToGetButton.addTarget(self, action: #selector(openGoogleMapsLink), for: .touchUpInside) howToGetButton.addTarget(self, action: #selector(openGoogleMapsLink), for: .touchUpInside)
howToGetButton.titleLabel?.font = format.subTitleFontStyle howToGetButton.titleLabel?.font = format.subTitleFontStyle
howToGetButton.heightAnchor.constraint(equalToConstant: 24).isActive = true howToGetButton.heightAnchor.constraint(equalToConstant: 30).isActive = true
let addressStackView = UIStackView(arrangedSubviews: [addressSubTittle, addressLabel, howToGetButton]) let addressStackView = UIStackView(arrangedSubviews: [addressSubTittle, addressLabel, howToGetButton])
addressStackView.axis = .vertical addressStackView.axis = .vertical
addressStackView.distribution = .equalSpacing addressStackView.distribution = .equalSpacing
...@@ -138,17 +139,25 @@ class RequestViewController: UIViewController { ...@@ -138,17 +139,25 @@ class RequestViewController: UIViewController {
contactNumberButton.layer.cornerRadius = 10 contactNumberButton.layer.cornerRadius = 10
contactNumberButton.setTitle("\(phoneNumber)", for: .normal) contactNumberButton.setTitle("\(phoneNumber)", for: .normal)
contactNumberButton.addTarget(self, action: #selector(call), for: .touchUpInside) contactNumberButton.addTarget(self, action: #selector(call), for: .touchUpInside)
contactNumberButton.heightAnchor.constraint(equalToConstant: 24).isActive = true contactNumberButton.heightAnchor.constraint(equalToConstant: 30).isActive = true
let contactInformationStackView = UIStackView(arrangedSubviews: [contactLabel, contactNameLabel, contactNumberButton]) let contactInformationStackView = UIStackView(arrangedSubviews: [contactLabel, contactNameLabel, contactNumberButton])
contactInformationStackView.axis = .vertical contactInformationStackView.axis = .vertical
contactInformationStackView.distribution = .fillEqually contactInformationStackView.distribution = .fillEqually
contactInformationStackView.spacing = 5 contactInformationStackView.spacing = 5
//Se muestra el botón y la etiqueta de marcar como listo //Se muestra el botón y la etiqueta de marcar como listo
checkLabel.text = "Marcar como listo" if isChecked{
checkButton.setImage(UIImage(named: "iconListoChecked"), for: .normal)
checkButton.addTarget(self, action: #selector(addOrRemoveChecked(sender: )), for: .touchUpInside)
checkLabel.text = "Desmarcar como listo"
}else{
checkButton.setImage(UIImage(named: "iconListoUnchecked"), for: .normal)
checkButton.addTarget(self, action: #selector(addOrRemoveChecked(sender: )), for: .touchUpInside)
checkLabel.text = "Marcar como listo"
}
checkLabel.font = format.bodyFontStyle checkLabel.font = format.bodyFontStyle
checkLabel.textAlignment = .center checkLabel.textAlignment = .center
checkButton.setImage(checkImage, for: .normal) checkLabel.numberOfLines = 2
let checkStackView = UIStackView(arrangedSubviews: [checkButton, checkLabel]) let checkStackView = UIStackView(arrangedSubviews: [checkButton, checkLabel])
checkStackView.axis = .vertical checkStackView.axis = .vertical
...@@ -188,9 +197,9 @@ class RequestViewController: UIViewController { ...@@ -188,9 +197,9 @@ class RequestViewController: UIViewController {
let scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: view.frame.width, height: view.frame.height)) let scrollView = UIScrollView(frame: CGRect(x: 0, y: 0, width: view.frame.width, height: view.frame.height))
scrollView.addSubview(stackView) scrollView.addSubview(stackView)
scrollView.isScrollEnabled = true
//view.addSubview(stackView) //view.addSubview(stackView)
view.addSubview(scrollView) view.addSubview(scrollView)
print(stackView.spacing)
} }
func isReadyCheck()->Bool{ func isReadyCheck()->Bool{
...@@ -216,6 +225,26 @@ class RequestViewController: UIViewController { ...@@ -216,6 +225,26 @@ class RequestViewController: UIViewController {
reloadInputViews() reloadInputViews()
} }
} }
@objc func addOrRemoveChecked(sender: UIButton){
if isChecked {
manager.deleteCheckObject(id: id, array: checkedList)
self.isChecked = false
sender.setImage(UIImage(named: "iconListoUnchecked"), for: .normal)
self.checkLabel.text = "Marcar como listo"
reloadInputViews()
}else
{
manager.saveInCheckedList(id: id, latitude: latitude, longitude: longitude, completion: { [weak self] in
print("\(self as Any) guardado!")
self?.isChecked = true
})
self.isChecked = true
sender.setImage(UIImage(named: "iconListoChecked"), for: .normal)
self.checkLabel.text = "Desmarcar como listo"
reloadInputViews()
}
}
@objc func openGoogleMapsLink(){ @objc func openGoogleMapsLink(){
if let url = NSURL(string: "https://www.google.com/maps/dir/\(currentLatitude),\(currentLongitude )/\(latitude),\(longitude)"){ if let url = NSURL(string: "https://www.google.com/maps/dir/\(currentLatitude),\(currentLongitude )/\(latitude),\(longitude)"){
UIApplication.shared.open(url as URL) UIApplication.shared.open(url as URL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment