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 #157

Merged
merged 84 commits into from
Nov 29, 2023
Merged

Dev #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
709a3de
Adição dos campos de nome e sobrenome
IsaacLusca Sep 6, 2023
62e66ad
confirmação de senha funcional e estilo
IsaacLusca Sep 13, 2023
cea6612
separação entre os imputs e aumento da div container
IsaacLusca Sep 13, 2023
78b251f
campo cpf e senha
IsaacLusca Sep 25, 2023
427cc3c
build: adicionando models para database
pedrobarbosaocb Sep 28, 2023
9e79ca1
fix: models.py
pedrobarbosaocb Sep 28, 2023
2028cf4
modelos imcompletos
IsaacLusca Sep 29, 2023
e719aca
fix: corrigindo tipagem dos dados
pedrobarbosaocb Sep 29, 2023
dac4cbc
fix: corrigindo tipo de dados
pedrobarbosaocb Sep 30, 2023
da0141b
fix: removendo linha incorreta
pedrobarbosaocb Sep 30, 2023
2778e5e
Update models.py
pedrobarbosaocb Sep 30, 2023
ab6ace9
Alterações mapeamento fundep fub opas
IsaacLusca Oct 1, 2023
9a7ea97
update: atualizando itens das models apos teste com banco
hemanoelbritoF Oct 7, 2023
bbd99c1
update: atualizando models
hemanoelbritoF Oct 9, 2023
00f75a0
alterações no background, navbar e navegabilidade
IsaacLusca Oct 11, 2023
f54ccf9
alterações no footer e degrade
IsaacLusca Oct 11, 2023
2e7d97f
login e cadastro
IsaacLusca Oct 18, 2023
d15f773
imagem de fundo
IsaacLusca Oct 18, 2023
b41760f
Update models.py
pedrobarbosaocb Oct 19, 2023
671ba49
Update models.py
pedrobarbosaocb Oct 19, 2023
d187b05
Merge pull request #138 from ResidenciaTICBrisa/criando-models
hemanoelbritoF Oct 20, 2023
4ef9125
ajustes
IsaacLusca Oct 23, 2023
833f68b
dropdown logout
IsaacLusca Oct 24, 2023
1d56ceb
adicionando home
raqueleucaria Oct 25, 2023
0232d8e
add html e css da home
raqueleucaria Oct 25, 2023
70cc886
update view e url
raqueleucaria Oct 25, 2023
cef1d7d
add logo.svg
raqueleucaria Oct 25, 2023
f3542a3
Resolvendo bug do login, adição da navbar na home
IsaacLusca Oct 25, 2023
7bc8ed2
campo data sem estilização
IsaacLusca Oct 25, 2023
c4149b7
cor ícone calendário
IsaacLusca Oct 25, 2023
8aa9206
add: adicionando mapeamento conveniar
pedrobarbosaocb Oct 25, 2023
a7b7b26
back
hemanoelbritoF Oct 26, 2023
53179d7
refactor: renomeando nome da model Lancamento
pedrobarbosaocb Oct 27, 2023
7b3ae5c
Update 0001_initial.py
pedrobarbosaocb Oct 27, 2023
bb36de8
Update 0002_rename_agencia_bancaria_mapeamento_agencia_bancaria_and_m…
pedrobarbosaocb Oct 27, 2023
370b8cd
Merge pull request #140 from ResidenciaTICBrisa/criando-models
hemanoelbritoF Oct 27, 2023
afc6fe0
Delete project/app/planilhas_preenchidas/planilhas/Modelo_Fub.xlsx
hemanoelbritoF Oct 27, 2023
bab12d1
Delete project/app/planilhas_preenchidas/planilhas/ModeloOPAS.xlsx
hemanoelbritoF Oct 27, 2023
0cc4309
Merge pull request #141 from ResidenciaTICBrisa/devfull
pedrobarbosaocb Oct 27, 2023
09a070f
Merge branch 'dev' into devfront
pedrobarbosaocb Oct 30, 2023
96be4fc
Merge pull request #142 from ResidenciaTICBrisa/devfront
pedrobarbosaocb Oct 30, 2023
41c6d48
leitura
hemanoelbritoF Oct 30, 2023
a59d89d
correção de bugs
hemanoelbritoF Oct 31, 2023
81c6bfc
remoção de prints
hemanoelbritoF Oct 31, 2023
5a50815
Update oracle_cruds.py
hemanoelbritoF Oct 31, 2023
3c706dd
Merge pull request #143 from ResidenciaTICBrisa/adicionando-credencia…
pedrobarbosaocb Oct 31, 2023
c81ce3c
função sair, e outras melhorias
IsaacLusca Nov 1, 2023
bd4adf3
Merge pull request #144 from ResidenciaTICBrisa/devfinal
hemanoelbritoF Nov 1, 2023
8aaa662
preenchendopessoafisica
hemanoelbritoF Nov 2, 2023
6e6426f
Merge pull request #145 from ResidenciaTICBrisa/pessoa_fisica
IsaacLusca Nov 3, 2023
f4bed34
adicionando capafinatec
hemanoelbritoF Nov 7, 2023
d97ad76
correção da função dropdown e cor template
IsaacLusca Nov 8, 2023
552ea8b
correção template
IsaacLusca Nov 8, 2023
62a1f85
delet git
IsaacLusca Nov 8, 2023
54f095f
Merge pull request #146 from ResidenciaTICBrisa/capa
pedrobarbosaocb Nov 8, 2023
d54f3ad
Merge pull request #147 from ResidenciaTICBrisa/devfinal
pedrobarbosaocb Nov 8, 2023
ea9622f
preenchimento fub
IsaacLusca Nov 13, 2023
33580fe
Merge pull request #149 from ResidenciaTICBrisa/preencher_fub
pedrobarbosaocb Nov 13, 2023
3a17204
preenchimento fub
Nov 13, 2023
156aa9a
Merge branch 'preencher_fub' of https://github.com/ResidenciaTICBrisa…
hemanoelbritoF Nov 13, 2023
6e41dc0
fundep inicial
hemanoelbritoF Nov 13, 2023
cf641b6
fundep final
hemanoelbritoF Nov 13, 2023
5db0fe7
prenchendo fub e fundep completado v0.2
hemanoelbritoF Nov 13, 2023
8951fe7
consertando data
hemanoelbritoF Nov 13, 2023
2efe6fa
Merge pull request #150 from ResidenciaTICBrisa/fundep
IsaacLusca Nov 13, 2023
28f3397
refatorandofub
hemanoelbritoF Nov 13, 2023
84820ba
backend da lista nova de projetos
hemanoelbritoF Nov 14, 2023
4894cf5
preenchimento fub
hemanoelbritoF Nov 13, 2023
38a7cb5
Merge pull request #151 from ResidenciaTICBrisa/listadeprojetos
raqueleucaria Nov 14, 2023
56bb188
Merge pull request #152 from ResidenciaTICBrisa/new-branch-name
hemanoelbritoF Nov 14, 2023
39c84a9
Merge pull request #153 from ResidenciaTICBrisa/preencher_fub
hemanoelbritoF Nov 14, 2023
36978f7
Delete project/app/__pycache__/estilo_fub.cpython-38.pyc
hemanoelbritoF Nov 14, 2023
f71c343
Delete project/project/__pycache__/urls.cpython-38.pyc
hemanoelbritoF Nov 14, 2023
75831a5
Delete project/project/__pycache__/settings.cpython-38.pyc
hemanoelbritoF Nov 14, 2023
6ac435e
Delete project/project/__pycache__/settings.cpython-38.pyc
hemanoelbritoF Nov 14, 2023
7ed4aaa
Delete project/project/__pycache__/urls.cpython-38.pyc
hemanoelbritoF Nov 14, 2023
b819dc1
Delete project/app/__pycache__/estilo_fub.cpython-38.pyc
hemanoelbritoF Nov 14, 2023
0d34c04
Merge pull request #154 from ResidenciaTICBrisa/preenchendofub2
hemanoelbritoF Nov 14, 2023
6b146d7
added git ignore
hemanoelbritoF Nov 14, 2023
67cb464
adicionando novo estilo
hemanoelbritoF Nov 16, 2023
8c9ba04
finalizando estilo fub
hemanoelbritoF Nov 20, 2023
103880c
estilos finalizados
hemanoelbritoF Nov 20, 2023
c0d866c
fimestilofub
hemanoelbritoF Nov 26, 2023
8d477fa
Merge pull request #156 from ResidenciaTICBrisa/fub_preenchimento
pedrobarbosaocb Nov 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 160 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
Binary file modified project/app/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file modified project/app/__pycache__/__init__.cpython-311.pyc
Binary file not shown.
Binary file added project/app/__pycache__/__init__.cpython-38.pyc
Binary file not shown.
Binary file modified project/app/__pycache__/admin.cpython-310.pyc
Binary file not shown.
Binary file modified project/app/__pycache__/admin.cpython-311.pyc
Binary file not shown.
Binary file added project/app/__pycache__/admin.cpython-38.pyc
Binary file not shown.
Binary file modified project/app/__pycache__/apps.cpython-310.pyc
Binary file not shown.
Binary file modified project/app/__pycache__/apps.cpython-311.pyc
Binary file not shown.
Binary file added project/app/__pycache__/apps.cpython-38.pyc
Binary file not shown.
Binary file added project/app/__pycache__/capa.cpython-38.pyc
Binary file not shown.
Binary file added project/app/__pycache__/estilo.cpython-38.pyc
Binary file not shown.
Binary file not shown.
Binary file modified project/app/__pycache__/models.cpython-310.pyc
Binary file not shown.
Binary file modified project/app/__pycache__/models.cpython-311.pyc
Binary file not shown.
Binary file added project/app/__pycache__/models.cpython-38.pyc
Binary file not shown.
Binary file added project/app/__pycache__/new_dev.cpython-38.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified project/app/__pycache__/urls.cpython-310.pyc
Binary file not shown.
Binary file modified project/app/__pycache__/urls.cpython-311.pyc
Binary file not shown.
Binary file added project/app/__pycache__/urls.cpython-38.pyc
Binary file not shown.
Binary file modified project/app/__pycache__/views.cpython-310.pyc
Binary file not shown.
Binary file modified project/app/__pycache__/views.cpython-311.pyc
Binary file not shown.
Binary file added project/app/__pycache__/views.cpython-38.pyc
Binary file not shown.
Loading
Loading