fixes curio version

parent 9907e6b0
registry=http://nexus.conexops.com.br/repository/npm/ registry=https://nexus.dev.evologica.com.br/repository/npm/
init.author.name = admin init.author.name = admin
init.author.email = suporte@evologica.com.br init.author.email = suporte@evologica.com.br
# an email is required to publish npm packages # an email is required to publish npm packages
......
This diff is collapsed.
{ {
"name": "siscon-cli", "name": "siscon-cli",
"version": "0.0.2", "version": "1.0.0",
"description": "siscon-cli", "description": "siscon-cli",
"main": "./siscon-cli.js", "main": "./siscon-cli.js",
"bin": { "bin": {
"siscon-cli": "./index.js" "siscon-cli": "./index.js"
}, },
"publishConfig": { "publishConfig": {
"registry": "http://nexus.conexops.com.br/repository/npm-internal/" "registry": "https://nexus.dev.evologica.com.br/repository/npm-internal/"
}, },
"scripts": { "scripts": {
"compile": "rimraf ./dist && tsc -p . --module commonjs --outDir ./dist && gulp copy-package", "compile": "rimraf ./dist && tsc -p . --module commonjs --outDir ./dist && gulp copy-package",
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
"chalk": "^2.1.0", "chalk": "^2.1.0",
"cli-table": "^0.3.1", "cli-table": "^0.3.1",
"commander": "^2.11.0", "commander": "^2.11.0",
"curiojs": "^2.0.0-alpha", "curiojs": "^2.4.8",
"figlet": "^1.2.0", "figlet": "^1.2.0",
"fuzzy": "^0.1.3", "fuzzy": "^0.1.3",
"inquirer": "^3.3.0", "inquirer": "^3.3.0",
......
import { UseCase, HttpConnection, Token } from 'curiojs' import { UseCase } from 'curiojs'
export type Item = { export type Item = {
_OID: string, _OID: string,
...@@ -35,26 +35,24 @@ export type ObterTarefaProjeto = { ...@@ -35,26 +35,24 @@ export type ObterTarefaProjeto = {
Tarefas: Tarefas Tarefas: Tarefas
} }
export class UcRegistrarPonto extends UseCase<Promise<any>> { export class UcRegistrarPonto {
static USECASEID = 788 static USECASEID = '788'
constructor (connection?: HttpConnection, token?: Token) { constructor (private useCase: UseCase) {}
super(connection, token)
}
obterContexto (): Promise<Contexto> { obterContexto (): Promise<Contexto> {
return this.request('RM_OBTEM_CONTEXTO') return this.useCase.request('RM_OBTEM_CONTEXTO')
} }
incluirRegistroPonto (): Promise<IncluirRegistroPonto> { incluirRegistroPonto (): Promise<IncluirRegistroPonto> {
return this.request('RM_INCLUIR_REGISTRO_PONTO') return this.useCase.request('RM_INCLUIR_REGISTRO_PONTO')
} }
confirmarRegistro () { confirmarRegistro () {
return this.request('RM_CONFIRMAR_REGISTRO') return this.useCase.request('RM_CONFIRMAR_REGISTRO')
} }
obterTarefaProjeto (codigo: number | string): Promise<ObterTarefaProjeto> { obterTarefaProjeto (codigo: number | string): Promise<ObterTarefaProjeto> {
return this.request('RM_OBTEM_TAREFA_PROJETO', {OBJECTID: {_: codigo}}) return this.useCase.request('RM_OBTEM_TAREFA_PROJETO', {OBJECTID: {_: codigo}})
} }
incluirTarefa (_OID: number | string, time: number, _Descricao: string) { incluirTarefa (_OID: number | string, time: number, _Descricao: string) {
const _Hora = Math.floor(time / 60) const _Hora = Math.floor(time / 60)
const _Minuto = time % 60 const _Minuto = time % 60
return this.request('RM_INCLUIR_TAREFA', {Tarefa: {_OID, _Hora, _Minuto, _Descricao}}) return this.useCase.request('RM_INCLUIR_TAREFA', {Tarefa: {_OID, _Hora, _Minuto, _Descricao}})
} }
} }
...@@ -3,8 +3,12 @@ export * from './UcRegistrarPonto' ...@@ -3,8 +3,12 @@ export * from './UcRegistrarPonto'
import config from '../config' import config from '../config'
const service: curio.Service = config().service export const service: curio.Service = {
...config().service,
debug: false
}
const connection = new curio.HttpConnection(service) export const sessionManager: curio.SessionManager = new curio.SessionManager(
connection.debug = false service,
export const sessionManager: curio.SessionManager<Promise<any>> = new curio.SessionManager(connection) curio.connection.http
)
import * as program from 'commander' import * as program from 'commander'
import { prompt } from 'inquirer' import { prompt } from 'inquirer'
import { sessionManager, UcRegistrarPonto } from '../../curio' import { sessionManager, UcRegistrarPonto } from '../../curio'
import { Session, SystemError, BusinessError, ConnectionError } from 'curiojs' import * as curio from 'curiojs'
import * as questions from '../../constants/questions' import * as questions from '../../constants/questions'
import * as chalk from 'chalk' import * as chalk from 'chalk'
import * as makeSpinner from 'ora' import * as makeSpinner from 'ora'
...@@ -20,17 +20,17 @@ program ...@@ -20,17 +20,17 @@ program
const spinner = makeSpinner() const spinner = makeSpinner()
try { try {
spinner.start(chalk.cyan('Realizando login...')) spinner.start(chalk.cyan('Realizando login...'))
const session: Session<Promise<UcRegistrarPonto>> = await sessionManager.login(username, password) const session = await sessionManager.login(username, password)
const ucRegistrarPonto = await session.open(UcRegistrarPonto) const ucRegistrarPonto = new UcRegistrarPonto(await session.open(UcRegistrarPonto.USECASEID))
const {Domains} = await ucRegistrarPonto.obterContexto() const {Domains} = await ucRegistrarPonto.obterContexto()
const {UltimoRegistroPonto, RegistroPonto} = await ucRegistrarPonto.incluirRegistroPonto() const {UltimoRegistroPonto, RegistroPonto} = await ucRegistrarPonto.incluirRegistroPonto()
spinner.succeed(`Login realizado com ${chalk.bold.italic.underline.green('sucesso')}`) spinner.succeed(`Login realizado com ${chalk.bold.italic.underline.green('sucesso')}`)
if (UltimoRegistroPonto && UltimoRegistroPonto[0]._Tipo === 'E') saida(Domains[0], UltimoRegistroPonto[0], RegistroPonto[0], ucRegistrarPonto) if (UltimoRegistroPonto && UltimoRegistroPonto[0]._Tipo === 'E') saida(Domains[0], UltimoRegistroPonto[0], RegistroPonto[0], ucRegistrarPonto)
else entrada(RegistroPonto[0], ucRegistrarPonto) else entrada(RegistroPonto[0], ucRegistrarPonto)
} catch (error) { } catch (error) {
if (error instanceof BusinessError) spinner.fail(chalk.bgRed.white.bold(error.message)) if (error instanceof curio.error.BusinessError) spinner.fail(chalk.bgRed.white.bold(error.message))
else if (error instanceof ConnectionError) spinner.fail(chalk.bgRed.white.bold(error.message)) else if (error instanceof curio.error.ConnectionError) spinner.fail(chalk.bgRed.white.bold(error.message))
else if (error instanceof SystemError) spinner.fail(chalk.bgRed.white.bold(error.message)) else if (error instanceof curio.error.SystemError) spinner.fail(chalk.bgRed.white.bold(error.message))
else console.error(error) else console.error(error)
} }
}) })
...@@ -2,7 +2,7 @@ import * as program from 'commander' ...@@ -2,7 +2,7 @@ import * as program from 'commander'
import { prompt } from 'inquirer' import { prompt } from 'inquirer'
import { UcRegistrarPonto, RegistroPonto, Item, Domain, Tarefa } from '../../../curio' import { UcRegistrarPonto, RegistroPonto, Item, Domain, Tarefa } from '../../../curio'
import { exit, accessSubtask, describeTask, timeTask, confirmExit } from '../../../constants/questions' import { exit, accessSubtask, describeTask, timeTask, confirmExit } from '../../../constants/questions'
import { BusinessError, SystemError, ConnectionError } from 'curiojs' import { BusinessError, SystemError, ConnectionError } from 'curiojs/errors'
import * as moment from 'moment' import * as moment from 'moment'
import * as chalk from 'chalk' import * as chalk from 'chalk'
import * as fuzzy from 'fuzzy' import * as fuzzy from 'fuzzy'
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"noImplicitReturns": true, "noImplicitReturns": true,
"noImplicitThis": true, "noImplicitThis": true,
"suppressImplicitAnyIndexErrors": true, "suppressImplicitAnyIndexErrors": true,
"allowUnreachableCode": true,
"moduleResolution": "node", "moduleResolution": "node",
"newLine": "LF", "newLine": "LF",
"target": "es6", "target": "es6",
......
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