Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #174

Closed
wants to merge 50 commits into from
Closed

Dev #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
8f57d11
foi feita alteracao para o banco do sqlserver
hemanoelbritoF Jan 18, 2024
074d113
alteracoes1801
hemanoelbritoF Jan 18, 2024
906769f
alteracoes1801.01
hemanoelbritoF Jan 18, 2024
ce2d22a
falta estilo exec,exec2, preenchimento da dr,rb e ra
hemanoelbritoF Jan 22, 2024
96989fe
tabela receiteXdespesa, e execReceitaDesepesa
hemanoelbritoF Jan 24, 2024
20f6987
finalizado fub por enquanto
hemanoelbritoF Jan 26, 2024
42f245a
Delete
hemanoelbritoF Jan 29, 2024
c9b530d
finalizei pandas conciliação bancaria
hemanoelbritoF Jan 30, 2024
597672b
completa reestruturação da fub com o pandas
hemanoelbritoF Feb 1, 2024
bbded65
Merge pull request #166 from ResidenciaTICBrisa/estagioAutomatec
pedrobarbosaocb Feb 1, 2024
ce238bd
fix: removendo impedimento de acesso por cpf e adicao de historico su…
hemanoelbritoF Feb 1, 2024
ec85872
refact: removendocodigos comentados tem uso
pedrobarbosaocb Feb 2, 2024
356f65a
feature: adicionando tela inicial de historico
pedrobarbosaocb Feb 2, 2024
20cf926
style:atualizando estrutura da page de logs com bootstrap
pedrobarbosaocb Feb 2, 2024
89e7ed3
feature: adicionando filtros a tela de historico
pedrobarbosaocb Feb 2, 2024
8e7272b
feat: adicionando logica de recuperacao de senha
pedrobarbosaocb Feb 5, 2024
0a7243c
Merge pull request #167 from ResidenciaTICBrisa/refatorando-login
pedrobarbosaocb Feb 5, 2024
16dc4e2
style: refatorando html base para reset
pedrobarbosaocb Feb 5, 2024
87e2782
style: criacao da tela de Redefinicao de Senha de acordo com o estilo…
pedrobarbosaocb Feb 6, 2024
289652a
refact: refatoração da homepage utilizando novo html base
pedrobarbosaocb Feb 6, 2024
8363950
fix: remocao do link da navbar quando esta na propria pagina
pedrobarbosaocb Feb 6, 2024
1009633
refact: refatoracao da tela de login usando a base de layout
pedrobarbosaocb Feb 6, 2024
051ca65
feat: adicao da tela 404 e tela inicial de perfil
pedrobarbosaocb Feb 7, 2024
25cb64a
style: estilizacao seguindo layout automatec da tela de perfil
pedrobarbosaocb Feb 7, 2024
6384ae3
feat: adicionando logica de recuperacao de senha
pedrobarbosaocb Feb 5, 2024
ce08fa0
feat: adicionando logica de recuperacao de senha
pedrobarbosaocb Feb 5, 2024
0215bed
fix: corrigindo merge inadequado
pedrobarbosaocb Feb 8, 2024
83ccecd
style: adicao de mascaras para dados sensiveis
pedrobarbosaocb Feb 8, 2024
c032dcf
fix: logs aparecem agora ordenados do mais recente para o mais antigo…
pedrobarbosaocb Feb 8, 2024
1dda9ce
style: adicao do modal de alteracao de senha
pedrobarbosaocb Feb 8, 2024
697af5b
refact: atualizacao inicial da nova pagina de projeto
pedrobarbosaocb Feb 8, 2024
ea14891
fub alfa lançada
Feb 9, 2024
b1f2d97
Merge pull request #168 from ResidenciaTICBrisa/adicionarTabelapPatri…
pedrobarbosaocb Feb 9, 2024
9c06c1d
refact: atualizacao da pagina de consultas de projetos
pedrobarbosaocb Feb 9, 2024
904bcf0
fix: pagina de alteracao de senha com versao estavel
pedrobarbosaocb Feb 9, 2024
4757cb0
Merge branch 'dev' into recuperacao-de-senha
pedrobarbosaocb Feb 9, 2024
1767dc1
Merge pull request #169 from ResidenciaTICBrisa/recuperacao-de-senha
pedrobarbosaocb Feb 9, 2024
0db55b6
feat: alteracao de senha pela page de perfil funcional
pedrobarbosaocb Feb 15, 2024
0260014
style: correcao da imagem de fundo de todas as paginas
pedrobarbosaocb Feb 15, 2024
5464554
feat: page de projetos atualizada com bootstrap vs inicial
pedrobarbosaocb Feb 16, 2024
38eada5
fix: correcao de textos em page de redefinicao de senha
pedrobarbosaocb Feb 16, 2024
a1e8385
Merge pull request #170 from ResidenciaTICBrisa/recuperacao-de-senha
pedrobarbosaocb Feb 16, 2024
727c190
fubhotfix
Feb 20, 2024
fff7849
terminaldoido
Feb 20, 2024
03ca29d
Merge pull request #171 from ResidenciaTICBrisa/Finep
pedrobarbosaocb Feb 20, 2024
55c33ad
fix: adicionando novas conexoes com banco
pedrobarbosaocb Feb 20, 2024
ced6869
Merge pull request #172 from ResidenciaTICBrisa/refatorando-front
hemanoelbritoF Feb 20, 2024
f473bc7
fixed the annoying bug
Feb 22, 2024
7960026
Merge branch 'dev' into Finep
pedrobarbosaocb Feb 22, 2024
1a3415b
Merge pull request #173 from ResidenciaTICBrisa/Finep
pedrobarbosaocb Feb 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified docs/atas/06-29.md
100644 → 100755
Empty file.
Empty file modified docs/atas/07-11.md
100644 → 100755
Empty file.
Empty file modified docs/atas/07-20.md
100644 → 100755
Empty file.
Empty file modified docs/atas/07-27.md
100644 → 100755
Empty file.
Empty file modified docs/atas/08-01.md
100644 → 100755
Empty file.
Empty file modified docs/atas/08-09.md
100644 → 100755
Empty file.
Empty file modified docs/atas/08-10.md
100644 → 100755
Empty file.
Empty file modified docs/atas/08-17.md
100644 → 100755
Empty file.
Empty file modified docs/index.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/StoryMapping.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/assets/fluxograma.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/planejamento/assets/incremental.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/planejamento/assets/logo.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/planejamento/assets/mvp.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/planejamento/assets/roadmap.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/planejamento/backlog/backlog.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/backlog/backlog1.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/contexto.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/escopo.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/fluxograma.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/heatmap.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/metodologia.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/requisitos/elicitacao.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/requisitos/priorizacao.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/roadmap.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/tecnologias.md
100644 → 100755
Empty file.
Empty file modified docs/planejamento/teste.md
100644 → 100755
Empty file.
Empty file modified docs/treinamento/estudos_individuais/PipelinedeDados.md
100644 → 100755
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified docs/treinamento/estudos_individuais/assets/fundBD/Untitled.png
100644 → 100755
Empty file modified docs/treinamento/estudos_individuais/fundamentosBD.md
100644 → 100755
Empty file.
Empty file modified docs/treinamento/estudos_individuais/linguagem_framework.md
100644 → 100755
Empty file.
Empty file modified docs/treinamento/estudos_individuais/metodologias.md
100644 → 100755
Empty file.
Empty file modified docs/treinamento/introducao.md
100644 → 100755
Empty file.
Empty file modified docs/treinamento/treinamentos/mkdocs.md
100644 → 100755
Empty file.
Empty file modified docs/treinamento/treinamentos/pipelinesimples.md
100644 → 100755
Empty file.
Empty file modified docs/treinamento/treinamentos/postgresql.md
100644 → 100755
Empty file.
Binary file added imagensCapa/agencia.png
Binary file added imagensCapa/agencia_branco.png
Binary file added imagensCapa/agente.png
Binary file added imagensCapa/agente_branco.png
Binary file added imagensCapa/analista.png
Binary file added imagensCapa/analista_branco.png
Binary file added imagensCapa/assinaturas_responsaveis.png
Binary file added imagensCapa/assistente.png
Binary file added imagensCapa/assistente_branco.png
Binary file added imagensCapa/banco.png
Binary file added imagensCapa/banco_branco.png
Binary file added imagensCapa/centrodecusto.png
Binary file added imagensCapa/centrodecusto_branco.png
Binary file added imagensCapa/conta_corrente.png
Binary file added imagensCapa/conta_corrente_branco.png
Binary file added imagensCapa/coordenador.png
Binary file added imagensCapa/coordenador_branco.png
Binary file added imagensCapa/dadosdoacordo.png
Binary file added imagensCapa/gerente.png
Binary file added imagensCapa/gerente_branco.png
Binary file added imagensCapa/periodo.png
Binary file added imagensCapa/periodo_branco.png
Binary file added imagensCapa/prestacaodecontaparcial.png
Binary file added imagensCapa/processo.png
Binary file added imagensCapa/processo_branco.png
Binary file added imagensCapa/projeto.png
Binary file added imagensCapa/projeto_branco.png
Binary file added imagensIBICIT/finatec.png
Binary file added imagensIBICIT/ibict.png
Empty file modified mkdocs.yml
100644 → 100755
Empty file.
Binary file added planilhas/IBICT.xlsx
Binary file not shown.
Binary file added planilhas/ModeloFAP.xlsx
Binary file not shown.
Binary file added planilhas/ModeloFINEP.xlsx
Binary file not shown.
Binary file added planilhas/ModeloFUNDEP.xlsx
Binary file not shown.
Binary file added planilhas/ModeloOPAS.xlsx
Binary file not shown.
Binary file added planilhas/Modelo_Fub.xlsx
Binary file not shown.
1 change: 1 addition & 0 deletions planilhas_preenchidas/planilhas/test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a
Empty file modified project/app/__init__.py
100644 → 100755
Empty file.
22 changes: 21 additions & 1 deletion project/app/admin.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.models import User

# Register your models here.
from .models import Employee


# Define an inline admin descriptor for Employee model
# which acts a bit like a singleton
class EmployeeInline(admin.StackedInline):
model = Employee
can_delete = False
verbose_name_plural = "employee"


# Define a new User admin
class UserAdmin(BaseUserAdmin):
inlines = [EmployeeInline]


# Re-register UserAdmin
admin.site.unregister(User)
admin.site.register(User, UserAdmin)
Empty file modified project/app/apps.py
100644 → 100755
Empty file.
35 changes: 18 additions & 17 deletions project/app/capa.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -99,23 +99,18 @@ def inserir_round_retangulo(planilha,data1,data2,dicionariofin):

planilha_local_dados = {
"Capa Finatec":[
("E6",'NOME_FINANCIADOR'),
("E9",'NOME'),
("E14",'COORDENADOR'),
("E17",'PROCESSO'),
("E19",'CODIGO'),
("K17",'BANCO'),
("K19",'CONTA_BANCARIA'),
("K21",'AGENCIA_BANCARIA'),
("E35",'Suellen Santos Diniz de Carvalho')
("E6",'NomePessoaFinanciador'),
("E9",'NomeConvenio'),
("E14",'NomePessoaResponsavel'),
("E17",'Processo'),
("E19",'CodConvenio'),
("K17",'NomeBanco'),
("K19",'Conta'),
("K21",'Agencia')

]
}






# Create an empty dictionary to store the values from the second dictionary
result_dict = {}

Expand Down Expand Up @@ -159,7 +154,7 @@ def inserir_round_retangulo(planilha,data1,data2,dicionariofin):
'gerente_branco.png',#17
'periodo.png',#18
'periodo_branco.png',#19
'prestaçãodecontasparcial.png',#20
'prestacaodecontaparcial.png',#20
'processo.png',#21
'processo_branco.png',#22
'projeto.png',#23
Expand All @@ -173,7 +168,7 @@ def inserir_round_retangulo(planilha,data1,data2,dicionariofin):
# List to hold Image objects
images = []

nomePasta = "imagensCapa"
nomePasta = "../../imagensCapa"
diretorio = os.path.dirname(__file__)

# Loop through the list of image names and create Image objects
Expand All @@ -185,7 +180,7 @@ def inserir_round_retangulo(planilha,data1,data2,dicionariofin):
images.append(img)



#daqui pra cima testado

#estilo imagem
worksheet.add_image(images[20], "B2")#prestação
Expand All @@ -210,6 +205,7 @@ def inserir_round_retangulo(planilha,data1,data2,dicionariofin):
worksheet['E6'].font = Font(name="Tahoma", size=9, color="204c80",bold=False)
worksheet['E6'].alignment = Alignment(horizontal="center",vertical="center",wrap_text=True)


worksheet.add_image(images[23], "B9")#projeto
worksheet.merge_cells('B9:D13')
worksheet['B9'] = 'PROJETO'
Expand Down Expand Up @@ -271,6 +267,8 @@ def inserir_round_retangulo(planilha,data1,data2,dicionariofin):
worksheet['K21'].font = Font(name="Tahoma", size=10, color="204c80",bold=False)
worksheet['K21'].alignment = Alignment(horizontal="center",vertical="center",wrap_text=True)

#testado

worksheet.add_image(images[25], "B19")#Centro de custo
worksheet.merge_cells('B19:D20')
worksheet['B19'] = 'CENTRO DE CUSTO'
Expand All @@ -292,6 +290,8 @@ def inserir_round_retangulo(planilha,data1,data2,dicionariofin):
worksheet['E21'] = f"{(data1)} a {(data2)}"
worksheet['E21'].font = Font(name="Tahoma", size=10, color="204c80",bold=False)
worksheet['E21'].alignment = Alignment(horizontal="center",vertical="center",wrap_text=True)
#testado


worksheet.add_image(images[7], "B30")#Assistente
worksheet.merge_cells('B30:D32')
Expand Down Expand Up @@ -329,3 +329,4 @@ def inserir_round_retangulo(planilha,data1,data2,dicionariofin):

# Save the workbook
workbook.save(planilha)
workbook.close()
Loading
Loading