Skip to content

Commit

Permalink
Merge pull request #162 from ResidenciaTICBrisa/lista-projetos
Browse files Browse the repository at this point in the history
Lista projetos
  • Loading branch information
hemanoelbritoF authored Dec 7, 2023
2 parents 6c2dae5 + 5825cec commit bcc1304
Show file tree
Hide file tree
Showing 9 changed files with 246 additions and 229 deletions.
1 change: 1 addition & 0 deletions project/app/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ body {
height: 100vh;
width: 100vw;
}

header {
display: flex;
align-items: center;
Expand Down
Binary file added project/app/static/imagem/baixar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added project/app/static/imagem/pesquisar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions project/app/templates/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<p class="otherLogin"><a href="/login/" class="link"><h1>Login</h1></a></p>
</div>
</header>

<content class="content">
<div class="container">
<h3>Login</h3>
Expand Down
56 changes: 39 additions & 17 deletions project/app/templates/projeto.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,13 @@
</script>
<link rel="stylesheet" href="{% static 'css/style.css' %}" />
<header>
<img
src="{% static 'imagem/finateclogo.svg' %}"
alt="finatec"
class="finatecLogo"
/>
<a href="/">
<img
src="{% static 'imagem/finateclogo.svg' %}"
alt="finatec"
class="finatecLogo"
/>
</a>
<div class="navButton">
<!-- <p class="otherLogin">
<a href="#" class="link" onclick="highlightButton(this)"
Expand Down Expand Up @@ -88,6 +90,22 @@
</div>
</header>

<style>
#inputTemplate select {
margin: 0;
/* display: block; */
}


/* .borderSelection {
border: 1px solid #bcbcbc;
border-radius: 20px;
display: flex;
justify-content: center;
} */

</style>

<content class="content">
<div class="containerProject">
<img
Expand Down Expand Up @@ -121,19 +139,23 @@ <h3>Selecione o projeto</h3>
<label class="name">Data fim</label>
<input class="placeholderProject" type="date" name="fim" id="fim" placeholder="00/00/0000" title="Digite uma data válida." max="8">
</div>
<div class="input">
<div class="input" id="inputTemplate">
<label class="name">Template</label>
<select
class="placeholderProject"
name="template"
id="template"
defaultValue=""
required>
<option value="" hidden>Selecione um template:</option>
{% for temp in templates %}
<option value={{temp.id}} class="option-model" >{{ temp.nome_template }}</option>
{% endfor %}
</select>
<!-- <div class="borderSelection"> -->
<select
class="placeholderProject"
name="template"
id="template"
defaultValue=""
required>
<option value="" hidden id="defaultSelection">
Selecione um template
</option>
{% for temp in templates %}
<option value={{temp.id}} class="option-model" >{{ temp.nome_template }}</option>
{% endfor %}
</select>
<!-- </div> -->
</div>
</div>
<div class="cardSubmit">
Expand Down
9 changes: 9 additions & 0 deletions project/backend/consultas_oracledb.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ def getCollumNames():
#criar um objeto cursor necessario para fazer as consultas
cur = conn.cursor()
cur.execute("SELECT * FROM IDEA.STG_PROJETOS_CONVENIAR")
# colunas_desejadas = [
# 'CODIGO', 'NOME', 'NOME_FINANCIADOR',
# 'DATA_ASSINATURA', 'DATA_VIGENCIA', 'COORDENADOR',
# 'VALOR_APROVADO', 'GRUPO_GESTORES'
# ]

# # Montar a consulta SQL selecionando apenas as colunas desejadas
# consulta_sql = "SELECT {} FROM IDEA.STG_PROJETOS_CONVENIAR".format(", ".join(colunas_desejadas))


return cur

Expand Down
Loading

0 comments on commit bcc1304

Please sign in to comment.