Skip to content
Open

td #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
cad495a
update
elsamanang Nov 30, 2018
7efed23
update
elsamanang Nov 30, 2018
6b4b355
new
elsamanang Nov 30, 2018
b8ab80d
new
elsamanang Nov 30, 2018
615d985
new
elsamanang Nov 30, 2018
8ce8bbf
new
elsamanang Nov 30, 2018
fe0bd8e
update
elsamanang Nov 30, 2018
88977ef
update
elsamanang Nov 30, 2018
b3c2611
update
elsamanang Nov 30, 2018
e4382ff
update
elsamanang Nov 30, 2018
f3d8e1c
update
elsamanang Dec 4, 2018
adfbe79
update
elsamanang Dec 4, 2018
9b51f8e
update
elsamanang Dec 4, 2018
2a90172
update
elsamanang Dec 4, 2018
1354a35
update
elsamanang Dec 4, 2018
d42b8e4
update
elsamanang Dec 4, 2018
50b3085
new
elsamanang Dec 4, 2018
4e2839f
update
elsamanang Dec 4, 2018
d6c2c35
update
elsamanang Dec 4, 2018
62058d6
update
elsamanang Jan 30, 2019
149012d
update
elsamanang Jan 30, 2019
f24a41f
update
elsamanang Jan 30, 2019
69b0e04
new
elsamanang Jan 30, 2019
5237ccc
new
elsamanang Jan 30, 2019
0beb31d
new
elsamanang Jan 30, 2019
3baf8b1
update
elsamanang Jan 30, 2019
ea76592
update
elsamanang Jan 30, 2019
8fd2a6f
update
elsamanang Jan 30, 2019
542d62e
update
elsamanang Jan 30, 2019
c865459
update
elsamanang Jan 31, 2019
0389232
update
elsamanang Jan 31, 2019
6f07a85
update
elsamanang Feb 5, 2019
1b333f6
update
elsamanang Feb 5, 2019
eda414d
update
elsamanang Feb 5, 2019
8b31a83
update
elsamanang Feb 5, 2019
7ea34f1
update
elsamanang Feb 5, 2019
0de9629
update
elsamanang Feb 5, 2019
420317c
update
elsamanang Feb 5, 2019
8ad68c9
update
elsamanang Feb 5, 2019
cd02829
update
elsamanang Feb 5, 2019
e4caf3d
Fix
elsamanang Feb 5, 2019
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
4 changes: 2 additions & 2 deletions application/config/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
|
| $autoload['libraries'] = array('user_agent' => 'ua');
*/
$autoload['libraries'] = array();
$autoload['libraries'] = array('database', 'session', 'form_validation');

/*
| -------------------------------------------------------------------
Expand Down Expand Up @@ -89,7 +89,7 @@
|
| $autoload['helper'] = array('url', 'file');
*/
$autoload['helper'] = array();
$autoload['helper'] = array('url');

/*
| -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion application/config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
| a PHP script and you can easily do that on your own.
|
*/
$config['base_url'] = 'http://localhost:1024/m-okapi/';
$config['base_url'] = 'http://localhost:82/m-okapi/';

/*
|--------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions application/config/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@
$db['default'] = array(
'dsn' => '',
'hostname' => 'localhost',
'username' => '',
'username' => 'root',
'password' => '',
'database' => '',
'database' => 'mokapi',
'dbdriver' => 'mysqli',
'dbprefix' => '',
'pconnect' => FALSE,
Expand Down
40 changes: 40 additions & 0 deletions application/controllers/MOkapi.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,46 @@ class MOkapi extends CI_Controller
{
public function index()
{
if($this->session->is_connected){
$this->load->view('utilisateur/acceuil');
}
$this->load->view('header.php');
$this->load->view('mokapi_home.php');
$this->load->view('footer.php');
}

//====================================================================================

public function add_entree() {
$this->form_validation->set_rules('nom','nom','required');
$this->form_validation->set_rules('montant','montant','required');
if($this->form_validation->run()){
$nom = $this->input->post('nom');
$montant = $this->input->post('montant');
$user = $this->session->id;
$date_ent = date('Y-m-d');
#mettre dans le model
}
}
public function add_catgorie_sortie() {
$this->form_validation->set_rules('nom','nom','required');
if($this->form_validation->run()){
$nom = $this->input->post('nom');
$user = $this->session->id;
#mettre dans le model
}
}
public function add_exercice_budgetaire() {
$this->form_validation->set_rules('datedebut','datedebut','required');
$this->form_validation->set_rules('datefin','datefin','required');
$this->form_validation->set_rules('budgetinitial','budgetinitial','required');
if($this->form_validation->run()){
$datedebut = $this->input->post('datedebut');
$datefin = $this->input->post('datefin');
$budgetinitial = $this->input->post('budgetinitial');
$user = $this->session->id;
$date_creation = date('Y-m-d');
#mettre dans le model
}
}
}
91 changes: 91 additions & 0 deletions application/controllers/Utilisateur.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
v<?php
defined('BASEPATH') OR exit('No direct script access allowed');

class Utilisateur extends CI_Controller
{
public function __construct()
{
parent::__construct();
$this->load->model('UtilisateurModel');
}
public function form_inscription()
{
$this->load->view('header.php');
$this->load->view('form_inscription.php');
$this->load->view('footer.php');
}
public function nouvel_utilisateur(){
$nomcomplet = $this->input->post('nomcomplet');
$login = $this->input->post('login');
$mdp = $this->input->post('mdp');
$mdp_conf = $this->input->post('mdp_conf');
$email = $this->input->post('email');
if($mdp == $mdp_conf){
$info= array(
'id'=> NULL,
'nomcomplet'=> $nomcomplet,
'login'=> $login,
'mdp'=> $mdp,
'email'=> $email,
'etat'=> FALSE

);
$this->UtilisateurModel->creer_utilisateur($info);
$lien = site_url();
echo "inscription reussie <br> <a href='$lien'>acceuil</a>";
}
else{
echo "Mot de passe non identique";
$this->load->view('header.php');
$this->load->view('form_inscription.php');
$this->load->view('footer.php');
}
}
public function connexion(){
$login = $this->input->post('login');
$mdp = $this->input->post('mdp');
$d = array(
'login' => $login,
'mdp' => $mdp
);

$r = $this->UtilisateurModel->login($d);
if(count($r) > 0){
$user = $r[0];
$d = array(
'id' => $user->id,
'nomcomplet' => $user->nomcomplet,
'is_connected' => true
);
$this->session->set_userdata($d);
$this->load->view('header.php');
redirect('utilisateur/acceuil');
$this->load->view('footer.php');

}
else{
$error = array(
'erreur'=> 'login ou mot de passe incorrect'
);
$this->session->set_flashdata($error);
$this->load->view('header.php');
$this->load->view('mokapi_home.php');
$this->load->view('footer.php');
}
}
public function acceuil(){
if($this->session->is_connected){
$this->load->view('header.php');
$this->load->view('utilisateur/acceuil');
$this->load->view('footer.php');
}
else{
redirect();

}
}
public function logout(){
$this->session->unset_userdata('is_connected');
redirect();
}
}
93 changes: 93 additions & 0 deletions application/models/UtilisateurModel.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');

class UtilisateurModel extends CI_Model{

/*===============================================================================================
@var $TableCategorie
@var $TableUtilisateur
@explication les attributs prives de la classe representant des table de la DB
*/
private $TableUtilisateur = 'utilisateur';
private $TableCategorie = 'categorie_sortie';

/*===============================================================================================
@param void
@return void
@explication constructeur de la classe qui invoque celui de la super class
*/
public function __construct()
{
parent::__construct();
}

/*===============================================================================================
@param string $Pass
@param string $Log
@return object
@explication renvoi toutes les infos selon les deux parametres
*/
public function LogInModel($Pass, $Log)
{
return $this->db->where(['login' => $Log, 'mdp' => $Pass])
->get($this->TableUtilisateur)->result();
}

/*===============================================================================================
@param string $Name
@param string $Pass
@param string $Log
@param string $Email
@return boolean
@explication ajoute un nom,password,login,email dans la table utilisateur
*/
public function CreateAccountModel($Name, $Pass, $Log, $Email)
{
$DataBase = [
'nomcomplet' => $Name,
'login' => $Log,
'mdp' => $Pass,
'email' => $Email,
'etat' => false
];

return $this->db->insert($this->TableUtilisateur, $DataBase);
}

/*===============================================================================================
@param int $id
@param string $pass
@return boolean
@explication update le password du user
*/
public function SetPassUserAccountModel($id, $Pass)
{
$this->db->where('id', $id)->set('mdp', $Pass);

return $this->db->update($this->TableUtilisateur);
}

/*===============================================================================================
@param string $categorie
@param string $Id
@return boolean
@explication ajoute une categorie dans la table categorie de sortie
*/
public function CreateOneCategorieModel($Categorie, $Id)
{
$DataBase = ['nom' => $Categorie, 'id_utilisateur' => $Id];

return $this->db->insert($this->TableCategorie, $DataBase);
}

/*===============================================================================================
@param string $categorie
@param string $Id
@return object
@explication renvoi toutes les categories
*/
public function GetAllCategoriesModel()
{
return $this->db->select()->get($this->TableCategorie)->result();
}
}
28 changes: 28 additions & 0 deletions application/views/footer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<script src="<?php echo base_url("assets/js/jquery-1.10.2.js");?>"></script>
<script src="<?php echo base_url("assets/js/bootstrap.js");?>"></script>
<script src="<?php echo base_url("assets/js/owl.carousel.js");?>"></script>
<script src="<?php echo base_url("assets/js/script.js");?>"></script>
<!-- StikyMenu -->
<script src="<?php echo base_url("assets/js/stickUp.min.js");?>"></script>
<script type="text/javascript">
jQuery(function($) {
$(document).ready( function() {
$('.navbar-default').stickUp();

});
});

</script>
<!-- Smoothscroll -->
<script type="text/javascript" src="<?php echo base_url("assets/js/jquery.corner.js");?>"></script>
<script src="<?php echo base_url("assets/js/wow.min.js");?>"></script>
<script>
new WOW().init();
</script>
<script src="<?php echo base_url("assets/js/classie.js");?>"></script>
<script src="<?php echo base_url("assets/js/uiMorphingButton_inflow.js");?>"></script>
<!-- Magnific Popup core JS file -->
<script src="<?php echo base_url("assets/js/jquery.magnific-popup.js");?>"></script>
</body>

</html>
50 changes: 50 additions & 0 deletions application/views/form_inscription.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@

<body id="home">
<div class="content-section-c ">
<div class="container">
<div class="row">
<div class="col-md-6 col text-center white">
<div id="owl-demo-1" class="owl-carousel">
<a href="<?php echo base_url("assets/img/iphone.png");?>" class="image-link">
<div class="item">
<img class="img-responsive img-rounded" src="<?php echo base_url("assets/img/iphone.png");?>" alt="">
</div>
</a>
<a href="<?php echo base_url("assets/img/doge.png");?>" class="image-link">
<div class="item">
<img class="img-responsive img-rounded" src="<?php echo base_url("assets/img/doge.png");?>" alt="">
</div>
</a>
<a href="<?php echo base_url("assets/img/ipad.png");?>" class="image-link">
<div class="item">
<img class="img-responsive img-rounded" src="<?php echo base_url("assets/img/ipad.png");?>" alt="">
</div>
</a>
</div>
</div>
<div class="col-md-6 text-center">
<div class="mockup-content">
<div class="morph-button wow pulse morph-button-inflow morph-button-inflow-1">
<button type="button "><span>Creation</span></button>
<div class="morph-content">
<div>
<div class="content-style-form content-style-form-4 ">
<h2 class="morph-clone">Creation</h2>
<form method="post" action="<?php echo site_url('utilisateur/CreateAccountUser')?>">
<p><label>Nom complet</label><input type="text" name="nomcomplet"></p>
<p><label>Login</label><input type="text" name="login"/></p>
<p><label>Mot de passe</label><input type="password" name="mdp"/></p>
<p><label>Confirmer</label><input type="password" name="mdp_conf"/></p>
<p><label>Emal</label><input type="email" name="email"></p>
<input type="submit" value="creer">
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

30 changes: 30 additions & 0 deletions application/views/header.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
?>

<!doctype html>
<html> <!--<![endif]-->
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
<meta name="description" content="M-Okapi">
<title>M-Okapi</title>
<link href="<?php echo base_url("assets/css/bootstrap.min.css");?>" rel="stylesheet"> <link href="<?php echo base_url("assets/font-awesome/css/font-awesome.min.css"); ;?>" rel="stylesheet">
<link href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Arvo:400,700' rel='stylesheet' type='text/css'>
<link href="<?php echo base_url("assets/css/general.css");?>" rel="stylesheet">

<!-- Owl-Carousel -->
<link href="<?php echo base_url("assets/css/custom.css");?>" rel="stylesheet">
<link href="<?php echo base_url("assets/css/owl.carousel.css");?>" rel="stylesheet">
<link href="<?php echo base_url("assets/css/owl.theme.css");?>" rel="stylesheet">
<link href="<?php echo base_url("assets/css/style.css");?>" rel="stylesheet">
<link href="<?php echo base_url("assets/css/animate.css");?>" rel="stylesheet">

<!-- Magnific Popup core CSS file -->
<link rel="stylesheet" href="<?php echo base_url("assets/css/magnific-popup.css");?>">

<script src="<?php echo base_url("assets/js/modernizr-2.8.3.min.js");?>"></script> <!-- Modernizr /-->


</head>
Loading