Skip to content

Commit

Permalink
Session
Browse files Browse the repository at this point in the history 
Ajustes no core que causava erros na sessão para php >=7
  • Loading branch information
@marcosandrade22
marcosandrade22 committed Jul 27, 2021
1 parent dd09d03 commit bbb49ca
Show file tree
Hide file tree
Showing 187 changed files with 2,991 additions and 2,360 deletions.
7 changes: 2 additions & 5 deletions application/controllers/Home.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,17 @@ public function debug(){

public function index()
{
//$this->output->enable_profiler(TRUE);

$this->load->model('M_home');
$this->load->model('Getuser');
$data['title'] = "Página Inicial - ".title_global;
$data['headline'] = "Controle de Estoque";
//$data['include'] = "estoque_index";
$data['resumo'] = $this->M_home->resumo_estoque();
$data['qt_resumo'] = $this->M_home->qt_resumo();
$this->load->view('v_header', $data);
$this->load->view('v_menu', $data);
$this->load->view('v_home', $data);
//$this->load->view('template', $data);
//$this->load->view('template_lista', $data);
}
}

function listar()
{
Expand Down
46 changes: 17 additions & 29 deletions application/controllers/Login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,53 +22,41 @@ public function index()
}

public function logar(){
// echo sha1('7894900')

$this->db->where('email_funcionario', $this->input->post('email'));
$this->db->where('senha_funcionario', sha1($this->input->post('senha')));
$this->db->where('status', '1');
$query = $this->db->get('funcionarios');
//inicia a sessão
//$this->load->library('session');

//$this->db->where('status', 1); // Verifica o status do usuário

// pegando post puro
$usuario = $this->input->post("email");
//$senha = sha1($this->input->post("senha"));

//Código sha1 da senha 123456 7c4a8d09ca3762af61e59520943dc26494f8941b
//O usuário no exemplo aqui será [email protected]
//Mas em um projeto real, você trará isto do banco de dados.

// pegando post puro
$usuario = $this->input->post("email");

//Se o usuário e senha combinarem, então basta eu redirecionar para a url base, pois agora o usuário irá passa
//pela verificação que checa se ele está logado.

if ($query->num_rows() == 1) {
// if (1 == 1) {
$this->session->set_userdata("logado", 1);
//Se o usuário e senha combinarem, então basta eu redirecionar para a url base, pois agora o usuário irá passa
//pela verificação que checa se ele está logado.
if ($query->num_rows() == 1) {

$this->session->set_userdata("logado", 1);


//carregando o model para pegar o usuario
$this->load->model('Getuser');
$news = $this->Getuser->get_user('funcionarios',$usuario);
//armazena o usuario na variavel

//armazena o usuario na variavel
$UsuarioNome = $news['nome_funcionario'];
$UsuarioID = $news['id_funcionario'];
// $Alias = $news['alias_funcionario'];
$UsuarioFuncao = $news['funcao_funcionario'];
$Departamento = $news['departamento'];
$Departamento = $news['departamento'];

// define o nome do usuario na sessão
$this->session->set_userdata("Usuario",$UsuarioNome);
$this->session->set_userdata("ID",$UsuarioID);
// $this->session->set_userdata("Alias",$Alias);
$this->session->set_userdata("Funcao",$UsuarioFuncao);
$this->session->set_userdata("Departamento",$Departamento);
$this->session->set_userdata("Funcao",$UsuarioFuncao);
$this->session->set_userdata("Departamento",$Departamento);

// pegando a funcao em outra tabela
// $this->load->model('getuser');
// $news2 = $this->getuser->get_funcao('funcionarios_funcoes',$UsuarioID);
// $UsuarioFuncao = $news2['funcao_id'];



if($Departamento == 7){

}
Expand Down
5 changes: 4 additions & 1 deletion application/models/Getuser.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ public function get_nome($id){
$this->db->where('id_funcionario', $id);
$query = $this->db->get('funcionarios');
$row = $query->row();
return $row->nome_funcionario;

if($row){
return $row->nome_funcionario;
}
}
}
?>
11 changes: 6 additions & 5 deletions application/models/M_nota.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

class M_nota extends CI_Model {

var $table = 'visao_nota';
var $column_order = array('data_visao', 'fornecedor_visao', 'numero_visao', 'visao_nota'); //set column field database for datatable orderable
var $column_search = array('data_visao', 'fornecedor_visao', 'numero_visao', 'visao_nota'); //set column field database for datatable searchable just firstname , lastname , address are searchable
var $table = 'nota';
var $column_order = array('data_nota', 'id_fornecedor', 'numero_nota', 'cod_nota'); //set column field database for datatable orderable
var $column_search = array('data_nota', 'id_fornecedor', 'numero_nota', 'cod_nota'); //set column field database for datatable searchable just firstname , lastname , address are searchable
var $order = array('data_visao' => 'desc'); // default order

public function __construct()
Expand Down Expand Up @@ -65,8 +65,9 @@ public function ListaDep() {
}

public function listNota(){
$this->db->order_by('data_visao', 'DESC');
$query = $this->db->get('visao_nota');
$this->db->order_by('data_nota', 'DESC');
$this->db->join('fornecedor', 'fornecedor.id_fornecedor=nota.id_fornecedor');
$query = $this->db->get('nota');
return $query->result();
}
public function delete($id = null){
Expand Down
2 changes: 1 addition & 1 deletion application/views/v_head_pdf.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="head_logo"><img align="left" height="50px" src="/img/logo.jpg" /></div>
<div class="head_logo"><img align="left" height="50px" src="<?php echo base_url();?>img/logo.jpg" /></div>

<div class="head_texto"><center><h3><?php echo nome_global; ?> </h3> <?php echo nomepq_global; ?><br>
<h2>Relatório de Estoque
Expand Down
2 changes: 1 addition & 1 deletion application/views/v_head_pdf_esp.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="head_logo"><img align="left" height="50px" src="/img/logo.jpg" /></div>
<div class="head_logo"><img align="left" height="50px" src="<?php echo base_url(); ?>img/logo.jpg" /></div>

<div class="head_texto"><center><h3><?php echo nome_global; ?> </h3> <?php echo nomepq_global; ?><br>
Sistema de Controle de <?php echo title_global; ?><br>
Expand Down
2 changes: 1 addition & 1 deletion application/views/v_head_pdf_requisicoes.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="head_logo"><img align="left" height="50px" src="/img/logo.jpg" /></div>
<div class="head_logo"><img align="left" height="50px" src="<?php echo base_url(); ?>img/logo.jpg" /></div>

<div class="head_texto"><center><h3><?php echo nome_global; ?> </h3> <?php echo nomepq_global; ?><br>
<h2>Relatório de Requisições</h2>
Expand Down
2 changes: 1 addition & 1 deletion application/views/v_head_pdf_rq.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="head_logo"><img align="left" height="50px" src="/img/logo.jpg" /></div>
<div class="head_logo"><img align="left" height="50px" src="<?php echo base_url(); ?>img/logo.jpg" /></div>

<div class="head_texto"><center><h3><?php echo nome_global; ?> </h3> <?php echo nomepq_global; ?><br>
Sistema de Controle de <?php echo title_global; ?><br>
Expand Down
2 changes: 1 addition & 1 deletion application/views/v_head_pdf_rq_at.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="head_logo"><img align="left" height="50px" src="/img/logo.jpg" /></div>
<div class="head_logo"><img align="left" height="50px" src="<?php echo base_url(); ?>img/logo.jpg" /></div>

<div class="head_texto"><center><h3><?php echo nome_global; ?> </h3> <?php echo nomepq_global; ?><br>
Sistema de Controle de <?php echo title_global; ?><br>
Expand Down
40 changes: 8 additions & 32 deletions application/views/v_home.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<tr>
<th>Dep.</th>
<th>Produtos</th>
<th>Valor</th>

</tr>
</thead>
<?php foreach($resumo as $resumo):
Expand All @@ -111,46 +111,22 @@
?>
<tr>
<td>
<?php echo $resumo->nome_departamento; ?>
<?php echo $resumo->nome_departamento; ?>
</td>
<td class="right">
<?php
$query5 = $this->db->query("SELECT * FROM estoque WHERE departamento_estoque = $resumo->id_departamento;");
$quant = "0";
$query5 = $this->db->query("SELECT * FROM produtos WHERE departamento_produto = $resumo->id_departamento;");
$quant = 0;
$quant_geral = 0;
foreach($query5->result() as $qt):
$quant= $quant+$qt->quantidade_estoque;


endforeach;
$quant= $quant+$qt->qt_produto;
endforeach;
$quant_geral = $quant_geral+$quant;
echo $quant;
echo $quant_geral;

?>
</td>
<td class="right">
<?php

$valor_final = '';
$query4 = $this->db->query("SELECT * FROM estoque WHERE departamento_estoque = $resumo->id_departamento;");
foreach($query4->result() as $qt):
$valor = str_replace(",",".",$qt->preco_estoque);
$valor_linha= $valor*$qt->quantidade_estoque;
$valor_final = $valor_final+$valor_linha;

endforeach;
$valor_geral = $valor_geral+$valor_final;

if(empty($valor_final)){
echo '0';
}
else{
echo number_format($valor_final,2,',','.');
}


?>

</td>
</tr>

<?php
Expand Down
2 changes: 1 addition & 1 deletion application/views/v_impre_etiquetas.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="etiquetas">
<div class="head-etiqueta">
<div class="img-etiqueta">
<img src="/img/logo.jpg" max-height="30px" align="left" />
<img src="<?php echo base_url(); ?>img/logo.jpg" max-height="30px" align="left" />
</div>
<div class="text-head-etiqueta">
<?php echo nome_global; ?><br><?php echo nomepq_global; ?>
Expand Down
12 changes: 6 additions & 6 deletions application/views/v_impre_etiquetas_multi.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="etiquetas">
<div class="head-etiqueta">
<div class="img-etiqueta">
<img src="/img/logo.jpg" max-height="30px" align="left" />
<img src="<?php echo base_url(); ?>img/logo.jpg" max-height="30px" align="left" />
</div>
<div class="text-head-etiqueta">
<?php echo nome_global; ?><br><?php echo nomepq_global; ?>
Expand Down Expand Up @@ -60,7 +60,7 @@
<div class="etiquetas">
<div class="head-etiqueta">
<div class="img-etiqueta">
<img src="/img/logo.jpg" max-height="30px" align="left" />
<img src="<?php echo base_url(); ?>img/logo.jpg" max-height="30px" align="left" />
</div>
<div class="text-head-etiqueta">
<?php echo nome_global; ?><br><?php echo nomepq_global; ?>
Expand Down Expand Up @@ -106,7 +106,7 @@
<div class="etiquetas">
<div class="head-etiqueta">
<div class="img-etiqueta">
<img src="/img/logo.jpg" max-height="30px" align="left" />
<img src="<?php echo base_url(); ?>img/logo.jpg" max-height="30px" align="left" />
</div>
<div class="text-head-etiqueta">
<?php echo nome_global; ?><br><?php echo nomepq_global; ?>
Expand Down Expand Up @@ -150,7 +150,7 @@
<div class="etiquetas">
<div class="head-etiqueta">
<div class="img-etiqueta">
<img src="/img/logo.jpg" max-height="30px" align="left" />
<img src="<?php echo base_url(); ?>img/logo.jpg" max-height="30px" align="left" />
</div>
<div class="text-head-etiqueta">
<?php echo nome_global; ?><br><?php echo nomepq_global; ?>
Expand Down Expand Up @@ -195,7 +195,7 @@
<div class="etiquetas">
<div class="head-etiqueta">
<div class="img-etiqueta">
<img src="/img/logo.jpg" max-height="30px" align="left" />
<img src="<?php echo base_url(); ?>img/logo.jpg" max-height="30px" align="left" />
</div>
<div class="text-head-etiqueta">
<?php echo nome_global; ?><br><?php echo nomepq_global; ?>
Expand Down Expand Up @@ -239,7 +239,7 @@
<div class="etiquetas">
<div class="head-etiqueta">
<div class="img-etiqueta">
<img src="/img/logo.jpg" max-height="30px" align="left" />
<img src="<?php echo base_url(); ?>img/logo.jpg" max-height="30px" align="left" />
</div>
<div class="text-head-etiqueta">
<?php echo nome_global; ?><br><?php echo nomepq_global; ?>
Expand Down
20 changes: 10 additions & 10 deletions application/views/v_lista_nota.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@
<tbody>
<?php foreach($fornecedor as $fornecedor): ?>
<tr>
<td><?php echo $fornecedor->numero_visao; ?></td>
<td><?php echo $fornecedor->serie_visao; ?></td>
<td><?php echo $fornecedor->fornecedor_visao; ?></td>
<td><?php echo date('d-m-Y' , strtotime($fornecedor->data_visao)); ?></td>
<td><?php echo $fornecedor->numero_nota; ?></td>
<td><?php echo $fornecedor->serie_nota; ?></td>
<td><?php echo $fornecedor->razao_social; ?></td>
<td><?php echo date('d-m-Y' , strtotime($fornecedor->data_nota)); ?></td>
<?php
if($fornecedor->fechado_visao == 0){
if($fornecedor->fechado == 0){
$CI =& get_instance(); if($CI->Controleacesso->acesso_funcao(5) == true){
echo '<td><a href="nota_fiscal/add_itens/'.$fornecedor->visao_nota.'" class="btn btn btn-sm btn-primary" ><i class="glyphicon glyphicon-plus"></i> Itens </a> </td>' ;
echo '<td><a href="nota_fiscal/add_itens/'.$fornecedor->cod_nota.'" class="btn btn btn-sm btn-primary" ><i class="glyphicon glyphicon-plus"></i> Itens </a> </td>' ;
}
else{
echo '<td></td>';
Expand All @@ -128,7 +128,7 @@

$CI =& get_instance(); if($CI->Controleacesso->acesso_funcao(2) == true){
echo '<td><a class="btn btn-sm btn-danger disabled" >Nota fechada</a> '
. '<a href="nota_fiscal/add_itens/'.$fornecedor->visao_nota.'" class="btn btn btn-sm btn-success" ><i class="glyphicon glyphicon-search"></i> Visualizar </a> </td> ';
. '<a href="nota_fiscal/add_itens/'.$fornecedor->cod_nota.'" class="btn btn btn-sm btn-success" ><i class="glyphicon glyphicon-search"></i> Visualizar </a> </td> ';
}
else{
echo '<td></td>';
Expand All @@ -138,16 +138,16 @@

//add html for action
// verificação se a nota esta fechada para exibição dos botões
if($fornecedor->fechado_visao == 0){
if($fornecedor->fechado == 0){
echo '<td>';
$CI =& get_instance(); if($CI->Controleacesso->acesso_funcao(3) == true){
echo'<a class="btn btn-sm btn-primary" href="javascript:void(0)" title="Edit" onclick="edit_produtos('."'".$fornecedor->visao_nota."'".')"><i class="glyphicon glyphicon-pencil"></i> Editar</a>';
echo'<a class="btn btn-sm btn-primary" href="javascript:void(0)" title="Edit" onclick="edit_produtos('."'".$fornecedor->cod_nota."'".')"><i class="glyphicon glyphicon-pencil"></i> Editar</a>';
}
else{

}
$CI =& get_instance(); if($CI->Controleacesso->acesso_funcao(4) == true){
echo ' <a class="btn btn-sm btn-danger" href="javascript:void(0)" title="Hapus" onclick="delete_produtos('."'".$fornecedor->visao_nota."'".')"><i class="glyphicon glyphicon-trash"></i> Del</a>';
echo ' <a class="btn btn-sm btn-danger" href="javascript:void(0)" title="Hapus" onclick="delete_produtos('."'".$fornecedor->cod_nota."'".')"><i class="glyphicon glyphicon-trash"></i> Del</a>';
}
else{

Expand Down
2 changes: 1 addition & 1 deletion application/views/v_login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<meta name="description" content="">
<meta name="author" content="">

<title>Estoque Ars - Área administrativa</title>
<title><?php echo title_global; ?> - Área administrativa</title>
<base href="<?php echo base_url(); ?>" >
<!-- Bootstrap Core CSS -->
<link href="<?php echo base_url() ;?>assets/css/bootstrap.min.css" rel="stylesheet">
Expand Down
Loading

0 comments on commit bbb49ca

Please sign in to comment.