Skip to content

Commit

Permalink
GH:Commit of v0.1 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bbalet
bbalet committed Sep 20, 2014
1 parent 1c765c1 commit 995ad01
Show file tree
Hide file tree
Showing 5 changed files with 157 additions and 51 deletions.
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ LMS is designed to provide simple leave and overtime request workflows for small

## Status

This project is being tested however some users have gone live. An online demo is available here : http://demo.leave-management-system.org/
This project is stable and ready for production. An online demo is available here : http://demo.leave-management-system.org/
Use bbalet / bbalet for login / password. Be nice and don't screw up the data of the demo.

## Features
Expand All @@ -31,7 +31,7 @@ Use bbalet / bbalet for login / password. Be nice and don't screw up the data of

## Installation

See <code>/docs/install/README.md</code> for advanced configuration. In a nutshell :
[See the installation instructions](docs/install/README.md) for advanced configuration. In a nutshell :
* Download or clone LMS.
* Upload the content of this folder on your server (in <code>/var/www/...</code>).
* Create a database with <code>/sql/lms.sql</code> script.
Expand All @@ -53,6 +53,7 @@ See <code>/docs/install/README.md</code> for advanced configuration. In a nutshe

* Suggest ideas, declare bugs with Github's issue tracking system.
* Translate the software in your language.
* Code enhancement requests declared in Github's issue tracking system.

## Credits

Expand Down
2 changes: 1 addition & 1 deletion application/config/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@
//Set this value to TRUE if you want to create leaves at status requested instead of planned
$config['leave_status_requested'] = FALSE;

$config['version'] = 'v0.1_beta2';
$config['version'] = 'v0.1';

//List of available languages
$config['languages'] = 'en,fr,km';
Expand Down
20 changes: 18 additions & 2 deletions application/controllers/database.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,26 @@ public function index() {

$data['dayoffs_count'] = $this->dayoffs_model->count();
$data['entitleddays_count'] = $this->entitleddays_model->count();
$data['history_users_count'] = $this->history_model->count('users');
$data['leaves_count'] = $this->leaves_model->count();
$data['overtime_count'] = $this->overtime_model->count();
$data['time_count'] = ''; //$this->time_model->count();

if ($this->config->item('enable_history') == true) {
$data['contracts_history_count'] = $this->history_model->count('contracts');
$data['entitleddays_history_count'] = $this->history_model->count('entitleddays');
$data['organization_history_count'] = $this->history_model->count('organization');
$data['overtime_history_count'] = $this->history_model->count('overtime');
$data['positions_history_count'] = $this->history_model->count('positions');
$data['types_history_count'] = $this->history_model->count('types');
$data['users_history_count'] = $this->history_model->count('users');
}

if ($this->config->item('enable_time') == true) {
$data['time_count'] = $this->time_model->count();
if ($this->config->item('enable_history') == true) {
$data['activities_employee_history_count'] = $this->history_model->count('activities_employee');
$data['activities_history_count'] = $this->history_model->count('activities');
}
}

$data['title'] = lang('database_index_title');
$this->load->view('templates/header', $data);
Expand Down
181 changes: 135 additions & 46 deletions application/views/database/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,65 +36,154 @@
</script>
<?php } ?>

<h1><?php echo lang('database_index_title');?></h1>

<table cellpadding="0" cellspacing="0" border="0" class="table table-bordered table-hover" id="contracts" width="100%">
<thead>
<tr>
<th><?php echo lang('database_index_thead_select');?></th>
<th><?php echo lang('database_index_thead_rows');?></th>
<th><?php echo lang('database_index_thead_table_name');?></th>
</tr>
</thead>
<tbody>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $leaves_count; ?></td>
<td><?php echo lang('database_index_table_leaves_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $overtime_count; ?></td>
<td><?php echo lang('database_index_table_overtime_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $dayoffs_count; ?></td>
<td><?php echo lang('database_index_table_dayoffs_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $history_users_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $entitleddays_count; ?></td>
<td><?php echo lang('database_index_table_entitleddays_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $time_count; ?></td>
<td><?php echo lang('database_index_table_time_desc');?></td>
</tr>
</tbody>
</table>
<h2><?php echo lang('database_index_title');?></h2>
</div>
</div>

<div class="row-fluid">
<div class="span12">
<h3><?php echo lang('database_index_title');?></h3>
</div>
</div>

<div class="row-fluid">
<div class="span12">
<table cellpadding="0" cellspacing="0" border="0" class="table table-bordered table-hover" id="contracts" width="100%">
<thead>
<tr>
<th><?php echo lang('database_index_thead_select');?></th>
<th><?php echo lang('database_index_thead_rows');?></th>
<th><?php echo lang('database_index_thead_table_name');?></th>
</tr>
</thead>
<tbody>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $leaves_count; ?></td>
<td><?php echo lang('database_index_table_leaves_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $overtime_count; ?></td>
<td><?php echo lang('database_index_table_overtime_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $dayoffs_count; ?></td>
<td><?php echo lang('database_index_table_dayoffs_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $entitleddays_count; ?></td>
<td><?php echo lang('database_index_table_entitleddays_desc');?></td>
</tr>
<?php if ($this->config->item('enable_time') == true) { ?>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $activities_employee_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $activities_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $time_count; ?></td>
<td><?php echo lang('database_index_table_time_desc');?></td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
</div>

<?php if ($this->config->item('enable_history') == true) { ?>
<div class="row-fluid">
<div class="span12">
<h3><?php echo lang('database_index_title');?></h3>
</div>
</div>

<div class="row-fluid">
<div class="span12">
<table cellpadding="0" cellspacing="0" border="0" class="table table-bordered table-hover" id="contracts" width="100%">
<thead>
<tr>
<th><?php echo lang('database_index_thead_select');?></th>
<th><?php echo lang('database_index_thead_rows');?></th>
<th><?php echo lang('database_index_thead_table_name');?></th>
</tr>
</thead>
<tbody>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $contracts_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $entitleddays_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $organization_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $overtime_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $positions_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $types_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $users_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<?php if ($this->config->item('enable_time') == true) { ?>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $activities_employee_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<tr>
<td><input type="checkbox" id="" name=""></td>
<td><?php echo $activities_history_count; ?></td>
<td><?php echo lang('database_index_table_history_users_desc');?></td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
</div>
<?php } ?>

<div class="row-fluid">
<div class="span12">&nbsp;</div>
</div>

<div class="row-fluid">
<div class="span3">
<div class="span5">
<label for="viz_todate">eeee<?php echo lang('users_create_field_lastname');?>
<input type="input" name="viz_todate" id="viz_todate" />
<input type="hidden" name="todate" id="todate" />
<input type="hidden" name="todate" id="todate" /></label>
</div>
<div class="span3">
<a href="<?php echo base_url();?>database/purge" class="btn btn-danger"><i class="icon-trash icon-white"></i>&nbsp; <?php echo lang('database_index_button_purge');?></a>
</div>
<div class="span6">&nbsp;</div>
<div class="span4">&nbsp;</div>
</div>

<link rel="stylesheet" href="<?php echo base_url();?>assets/css/flick/jquery-ui-1.10.4.custom.min.css">
Expand Down
Binary file removed tests/smtp4dev.exe
View file
Binary file not shown.

0 comments on commit 995ad01

Please sign in to comment.