Navigation Menu

Skip to content

Commit

Permalink
iniciando a proposta de arquitetura, ainda em andamento
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichelCordeiro
MichelCordeiro committed May 20, 2016
1 parent 14836f2 commit 04df7d1
Show file tree
Hide file tree
Showing 6 changed files with 134 additions and 37 deletions.
60 changes: 50 additions & 10 deletions SextouNTI.xcodeproj/project.pbxproj
View file
Expand Up @@ -25,6 +25,8 @@
1F96EF071CD7A68300216741 /* Usuario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F96EF061CD7A68300216741 /* Usuario.swift */; };
1F96EF081CD7A68300216741 /* Usuario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F96EF061CD7A68300216741 /* Usuario.swift */; };
1F9F72331CE93F720010CF96 /* MD5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F9F72321CE93F720010CF96 /* MD5.swift */; };
484D105E1CEFC22800E129D6 /* LoginIterator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484D105D1CEFC22800E129D6 /* LoginIterator.swift */; };
484D10601CEFCE3000E129D6 /* Alerta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484D105F1CEFCE3000E129D6 /* Alerta.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -57,6 +59,8 @@
1F96EF061CD7A68300216741 /* Usuario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Usuario.swift; sourceTree = "<group>"; };
1F9F72321CE93F720010CF96 /* MD5.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MD5.swift; sourceTree = "<group>"; };
1F9F72371CE96D1D0010CF96 /* SextouNTI-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SextouNTI-Bridging-Header.h"; sourceTree = "<group>"; };
484D105D1CEFC22800E129D6 /* LoginIterator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginIterator.swift; sourceTree = "<group>"; };
484D105F1CEFCE3000E129D6 /* Alerta.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Alerta.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -98,17 +102,13 @@
1F96EEDE1CD79EF400216741 /* SextouNTI */ = {
isa = PBXGroup;
children = (
484D105C1CEFC20900E129D6 /* Iterator */,
484D105A1CEFC05300E129D6 /* View */,
484D10591CEFC04B00E129D6 /* Controllers */,
1F9F72311CE93F1D0010CF96 /* Util */,
1F96EEFF1CD7A18600216741 /* Dominio */,
1F96EEFF1CD7A18600216741 /* Model */,
1F96EEDF1CD79EF400216741 /* AppDelegate.swift */,
1F45D15E1CEB57DF0035B58E /* UsuarioViewController.swift */,
1F9F72371CE96D1D0010CF96 /* SextouNTI-Bridging-Header.h */,
1F96EEE11CD79EF400216741 /* LoginViewController.swift */,
1F96EEE31CD79EF400216741 /* Main.storyboard */,
1F348C461CEA10F000BDE0A9 /* TrilhaTableViewController.swift */,
1F348C441CEA039A00BDE0A9 /* TrilhaTableViewCell.swift */,
1F96EEE61CD79EF400216741 /* Assets.xcassets */,
1F96EEE81CD79EF400216741 /* LaunchScreen.storyboard */,
1F96EEEB1CD79EF400216741 /* Info.plist */,
);
path = SextouNTI;
Expand All @@ -123,22 +123,24 @@
path = SextouNTITests;
sourceTree = "<group>";
};
1F96EEFF1CD7A18600216741 /* Dominio */ = {
1F96EEFF1CD7A18600216741 /* Model */ = {
isa = PBXGroup;
children = (
1F96EF001CD7A28400216741 /* Comentario.swift */,
1F96EF031CD7A57D00216741 /* Trilha.swift */,
1F96EF061CD7A68300216741 /* Usuario.swift */,
1F18998C1CD8462E00A12A4B /* Perfil.swift */,
);
name = Dominio;
name = Model;
sourceTree = "<group>";
};
1F9F72311CE93F1D0010CF96 /* Util */ = {
isa = PBXGroup;
children = (
1F9F72371CE96D1D0010CF96 /* SextouNTI-Bridging-Header.h */,
1F9F72341CE944520010CF96 /* Obj-C */,
1F9F72321CE93F720010CF96 /* MD5.swift */,
484D105F1CEFCE3000E129D6 /* Alerta.swift */,
);
name = Util;
sourceTree = "<group>";
Expand All @@ -150,6 +152,42 @@
name = "Obj-C";
sourceTree = "<group>";
};
484D10591CEFC04B00E129D6 /* Controllers */ = {
isa = PBXGroup;
children = (
484D105B1CEFC1CF00E129D6 /* Cells */,
1F348C461CEA10F000BDE0A9 /* TrilhaTableViewController.swift */,
1F96EEE11CD79EF400216741 /* LoginViewController.swift */,
1F45D15E1CEB57DF0035B58E /* UsuarioViewController.swift */,
);
name = Controllers;
sourceTree = "<group>";
};
484D105A1CEFC05300E129D6 /* View */ = {
isa = PBXGroup;
children = (
1F96EEE81CD79EF400216741 /* LaunchScreen.storyboard */,
1F96EEE31CD79EF400216741 /* Main.storyboard */,
);
name = View;
sourceTree = "<group>";
};
484D105B1CEFC1CF00E129D6 /* Cells */ = {
isa = PBXGroup;
children = (
1F348C441CEA039A00BDE0A9 /* TrilhaTableViewCell.swift */,
);
name = Cells;
sourceTree = "<group>";
};
484D105C1CEFC20900E129D6 /* Iterator */ = {
isa = PBXGroup;
children = (
484D105D1CEFC22800E129D6 /* LoginIterator.swift */,
);
name = Iterator;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -253,9 +291,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
484D105E1CEFC22800E129D6 /* LoginIterator.swift in Sources */,
1F9F72331CE93F720010CF96 /* MD5.swift in Sources */,
1F96EF011CD7A28400216741 /* Comentario.swift in Sources */,
1F96EEE21CD79EF400216741 /* LoginViewController.swift in Sources */,
484D10601CEFCE3000E129D6 /* Alerta.swift in Sources */,
1F348C451CEA039A00BDE0A9 /* TrilhaTableViewCell.swift in Sources */,
1F96EEE01CD79EF400216741 /* AppDelegate.swift in Sources */,
1F18998D1CD8462E00A12A4B /* Perfil.swift in Sources */,
Expand Down
22 changes: 22 additions & 0 deletions SextouNTI/Alerta.swift
View file
@@ -0,0 +1,22 @@
//
// Alerta.swift
// SextouNTI
//
// Created by Michel Cordeiro on 20/05/16.
// Copyright © 2016 br.com.fagutapp. All rights reserved.
//

import UIKit


class Alerta {


class func alerta(msg : String, viewController: UIViewController) {

let alert = UIAlertController(title: "Alerta", message: msg, preferredStyle: UIAlertControllerStyle.Alert)
alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.Default, handler: nil))

viewController.presentViewController(alert, animated: true, completion: nil)
}
}
2 changes: 1 addition & 1 deletion SextouNTI/Base.lproj/LaunchScreen.storyboard
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
Expand Down
2 changes: 1 addition & 1 deletion SextouNTI/Base.lproj/Main.storyboard
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
Expand Down
18 changes: 18 additions & 0 deletions SextouNTI/LoginIterator.swift
View file
@@ -0,0 +1,18 @@
//
// LoginIterator.swift
// SextouNTI
//
// Created by Michel Cordeiro on 20/05/16.
// Copyright © 2016 br.com.fagutapp. All rights reserved.
//

import Foundation


class LoginIterator {





}
67 changes: 42 additions & 25 deletions SextouNTI/LoginViewController.swift
View file
Expand Up @@ -30,32 +30,31 @@ class LoginViewController: UIViewController, UITextViewDelegate, NSURLConnection

func CarregaUsuario(object: NSDictionary) {

let usuarioLogin = Usuario()

usuarioLogin.codigo = object["codigo"] as! Int
usuarioLogin.nome = object["nome"] as! String
usuarioLogin.email = object["email"] as! String
usuarioLogin.matricula = object["matricula"] as! Int

/*
if let perfil = object["perfil"] as? NSDictionary {
usuarioLogin.perfil.codigo = perfil["codigo"] as! Int
usuarioLogin.perfil.nome = perfil["nome"] as! String
usuarioLogin.perfil.descricao = perfil["descricao"] as! String
let usuarioLogin = Usuario()

}
*/

print("Codigo: \(usuarioLogin.codigo)")
print("Nome: \(usuarioLogin.nome)")
//print("Perfil: \(usuarioLogin.perfil.nome)")
//print("Descrição: \(usuarioLogin.perfil.descricao)")

UserNameLabel.text = String(usuarioLogin.codigo) + " - " + usuarioLogin.nome

self.performSegueWithIdentifier("segueForTrilha", sender: self)


usuarioLogin.codigo = object["codigo"] as! Int
usuarioLogin.nome = object["nome"] as! String
usuarioLogin.email = object["email"] as! String
usuarioLogin.matricula = object["matricula"] as! Int

/*
if let perfil = object["perfil"] as? NSDictionary {
usuarioLogin.perfil.codigo = perfil["codigo"] as! Int
usuarioLogin.perfil.nome = perfil["nome"] as! String
usuarioLogin.perfil.descricao = perfil["descricao"] as! String
}
*/

print("Codigo: \(usuarioLogin.codigo)")
print("Nome: \(usuarioLogin.nome)")
//print("Perfil: \(usuarioLogin.perfil.nome)")
//print("Descrição: \(usuarioLogin.perfil.descricao)")

UserNameLabel.text = String(usuarioLogin.codigo) + " - " + usuarioLogin.nome

self.performSegueWithIdentifier("segueForTrilha", sender: self)

}

Expand All @@ -78,15 +77,32 @@ class LoginViewController: UIViewController, UITextViewDelegate, NSURLConnection

let url = NSURL( string: "http://www.ceuma.br/ServicosOnlineDev/servicosSextouNTI/login?token=99678f8f11be783c5e33c11008ba6772&email=" + usuario.email + "&password=" + usuario.senha)!

NSLog("url de conexão: \(url)")

NSOperationQueue.mainQueue().addOperationWithBlock {
let task = http.dataTaskWithURL(url) {(data, response, error ) -> Void in

if(error != nil) {

Alerta.alerta("Erro ao chamar serviço! ", viewController: self)

print("URL Error!!")
} else {
do {
let object = try NSJSONSerialization.JSONObjectWithData(data!, options: NSJSONReadingOptions.MutableContainers) as! NSDictionary
self.CarregaUsuario(object)


// Verifica se o serviço retornou uma mensagem de erro, já padronizada com código 13
if(object.allValues.last?.description == "13"){

// Alerta.alerta("Usuario/Senha inválidos! ", viewController: self)
self.UserNameLabel.text = "Usuario/Senha inválidos!"
}else{

self.CarregaUsuario(object)
}


} catch let jsonError as NSError {
print( "JSONError: \( jsonError.localizedDescription )")
}
Expand All @@ -95,6 +111,7 @@ class LoginViewController: UIViewController, UITextViewDelegate, NSURLConnection
task.resume()
}
} else {
// Alerta.alerta("Usuario/Senha inválidos! ", viewController: self)
UserNameLabel.text = "Usuario/Senha inválidos!"
}

Expand Down

0 comments on commit 04df7d1

Please sign in to comment.