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

Develop #24

Closed
wants to merge 113 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
bd02774
DB initialization 1
jhaniot Nov 15, 2017
f327377
Initial Database Migration
jhaniot Nov 16, 2017
1b5e233
Init Finance DB - contraints addition
jhaniot Nov 16, 2017
84f4378
Init Finance DB - change in invoice/expenditures fk relations
jhaniot Nov 16, 2017
dfa6e05
Database percentage check correction
jhaniot Nov 17, 2017
87de4c7
Init Finance DB - suppl_id fk in expenditues
jhaniot Nov 17, 2017
27c3981
CRUD KAE + Supplier
jhaniot Nov 17, 2017
28358fd
Suppliers + KAE + KAECredit + TaxOffice
jhaniot Nov 20, 2017
0ffd1c6
DB changes in Invoice table
jhaniot Nov 21, 2017
4aed1fd
UI changes
jhaniot Nov 21, 2017
65d0276
Operations admin functions
spapad Nov 21, 2017
63b0c01
Add role for module
spapad Nov 21, 2017
983f35f
Merge pull request #14 from spapad/operations
spapad Nov 21, 2017
770e018
Changes in DB/UI, Collapse Panel etc
jhaniot Nov 21, 2017
4b428d7
Check working year - db improvements
jhaniot Nov 22, 2017
847bedc
Start of KAE credits section
jhaniot Nov 22, 2017
817d427
KAE credits
jhaniot Nov 23, 2017
6ea6c94
Weekendgit status!
jhaniot Nov 24, 2017
9d8c0ff
Withdrawlals
jhaniot Nov 27, 2017
e6bbd62
Year & Kae Credits
jhaniot Nov 28, 2017
d04469f
Make year currently working
jhaniot Nov 29, 2017
65d0bad
Integrity, FinanceKae...
jhaniot Nov 29, 2017
e63cd66
Minor Changes in Integrity class
jhaniot Nov 29, 2017
7400eb2
Positions management (#15)
spapad Nov 30, 2017
72808e4
Credits integrity constraints
jhaniot Nov 30, 2017
535a819
Modifications in KaeYear, KaeCredits and addition of finance_kaecredi…
jhaniot Nov 30, 2017
8c9f738
Minor changes
jhaniot Nov 30, 2017
6746806
Kae credits percentages
jhaniot Dec 1, 2017
4592429
Operations calls (#16)
spapad Dec 4, 2017
b962119
Percentages (cont.)
jhaniot Dec 4, 2017
04761cc
Credit Percentages completion
jhaniot Dec 5, 2017
761e48a
Minor Changes (breadcrumbs, actioncolumn etc)
jhaniot Dec 5, 2017
83f5648
Internationalization
jhaniot Dec 6, 2017
92ed672
Translation cont.
jhaniot Dec 7, 2017
271a597
Internationalization
jhaniot Dec 8, 2017
9734e3d
Withdrawals
jhaniot Dec 11, 2017
8159fb3
Kae Withdrawals
jhaniot Dec 12, 2017
1b092a7
Minor literal changes
jhaniot Dec 12, 2017
960236b
Access control
jhaniot Dec 14, 2017
a9aed18
Access control (addmap migrations return back)
jhaniot Dec 14, 2017
9bf7ab1
UI tidy up
jhaniot Dec 15, 2017
71e3ab9
CRUD changes
jhaniot Dec 18, 2017
d7a9ce4
Expenditure States
jhaniot Dec 19, 2017
3b39a49
VAT options
jhaniot Dec 20, 2017
aa5ce88
Deductions init
jhaniot Jan 4, 2018
3cc505c
Deductions complete
jhaniot Jan 5, 2018
2622336
Create expenditures
jhaniot Jan 9, 2018
e8c6d8e
Database change to allow multiple withdrwals connection on an expendi…
jhaniot Jan 9, 2018
82f3450
Expenditures cont.
jhaniot Jan 10, 2018
06fe1a4
Expenditures cont. 11/01/2018
jhaniot Jan 11, 2018
f9eb29f
Expenditures cont. 3
jhaniot Jan 12, 2018
4df9751
Operations admin functions
spapad Nov 21, 2017
f762d18
Add role for module
spapad Nov 21, 2017
7f83b11
Positions management (#15)
spapad Nov 30, 2017
49794d0
Operations calls (#16)
spapad Dec 4, 2017
e565295
Merge branch 'develop' of github.com:spapad/admapp into develop
spapad Jan 15, 2018
1315537
Call management complete
spapad Nov 30, 2017
ee91dd6
Manage call positions
spapad Dec 4, 2017
4155fcb
Add logo support for operations
spapad Jan 15, 2018
cdef2ce
Add school type to positions
spapad Jan 15, 2018
1e9fc39
Bootstrap Modal
jhaniot Jan 16, 2018
e233abf
Bootstrap Modal
jhaniot Jan 16, 2018
3b6d456
State forward/backward + expenditure deletion
jhaniot Jan 16, 2018
43665b7
Deductions in expenditures
jhaniot Jan 16, 2018
a41ac5c
Finance Deductions and Invoices (init.)
jhaniot Jan 17, 2018
73330ae
Invoices init.
jhaniot Jan 18, 2018
0a1f95d
Invoices cont. 2
jhaniot Jan 19, 2018
499e9b2
Tidy up
jhaniot Jan 22, 2018
85a5f64
Corrections
jhaniot Jan 23, 2018
4b1a938
Currency Format
jhaniot Jan 25, 2018
0f4c5db
Substritute teachers registry and placement preferences (#17)
spapad Jan 26, 2018
051899e
Deductions changes, Widthdrawals UI etc.
jhaniot Jan 26, 2018
3899bfd
Fix php7-only feature
spapad Jan 29, 2018
bd76eb8
Improvements 29012018
jhaniot Jan 29, 2018
ce2e1b3
Improvements & Expenditure Report
jhaniot Jan 30, 2018
2f235fc
Payment report
jhaniot Jan 31, 2018
ced23c7
Info panel chart
jhaniot Jan 31, 2018
b515c5a
Roles
jhaniot Feb 1, 2018
eac3419
Chart + Update of exp states
jhaniot Feb 2, 2018
689e5fe
Merge branch 'master' into develop
spapad Feb 5, 2018
b771e04
Substitute teacher module changes (#18)
spapad Feb 5, 2018
f19e31f
Merge branch 'develop' of github.com:spapad/rektis into develop
spapad Feb 5, 2018
3bb7ddd
Add status change functionality
spapad Feb 5, 2018
83c75f8
Search fix
jhaniot Feb 5, 2018
dcc1cad
Expenditures Search & Chart improvements
jhaniot Feb 6, 2018
831c471
Merge branch 'develop' into Financial
jhaniot Feb 6, 2018
c1ac1f9
Merge pull request #19 from spapad/Financial
jhaniot Feb 6, 2018
70cf1ec
Composer update
spapad Feb 6, 2018
863e6e1
Add menu for spedu users
spapad Feb 6, 2018
92e92f2
fix module
spapad Feb 6, 2018
b8d5d34
Re-arrange menu
spapad Feb 6, 2018
59ea32f
Improvements
jhaniot Feb 7, 2018
39ea5de
Merge pull request #20 from spapad/develop_financial
jhaniot Feb 7, 2018
46c8b95
csfixer finance
spapad Feb 7, 2018
58dbd20
csfixer substitute teacher module
spapad Feb 7, 2018
3f00d7b
Small changes
jhaniot Feb 8, 2018
29de84d
UI changes
jhaniot Feb 8, 2018
7a62feb
PHP7 - PHP5 problem fix
jhaniot Feb 8, 2018
00e2174
Develop financial (#21)
jhaniot Feb 8, 2018
920decb
Expenditures links fix
jhaniot Feb 9, 2018
cb90be5
Expenditures
jhaniot Feb 14, 2018
1f18d4c
View Changes + expenditures edit
jhaniot Feb 15, 2018
c1afb98
Check credit change - withdrawals
jhaniot Feb 16, 2018
0831ff2
Change default values for school types
spapad Feb 20, 2018
571d61f
Various Improvements
jhaniot Feb 20, 2018
d52dc26
Payment report pdf
jhaniot Feb 22, 2018
c895a95
Expenditures corrections
jhaniot Feb 23, 2018
3f129fa
Logging
jhaniot Feb 26, 2018
e03cf80
Export Cover Sheet
jhaniot Feb 28, 2018
7e6ef6a
Cover Sheet + deductions improvements
jhaniot Mar 1, 2018
aa03862
File Upload (1)
jhaniot Mar 2, 2018
3d9a198
Merge branch 'develop_financial' into develop
jhaniot Mar 2, 2018
ad941d7
Merging develop - develop_financial
jhaniot Mar 2, 2018
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
Prev Previous commit
Next Next commit
Positions management (#15)
* Import functionality
* CRUD functions
* Supporting entities and functions
* New migrations
* New role for authorisation
* New composer dependencies
  • Loading branch information
spapad authored Nov 30, 2017
commit 7400eb26f9fbf59b2fb0c7c5228abbb57e2d6bd6
16 changes: 16 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Συνεισφορά στο έργο

_[Κείμενο υπό αναθεώρηση]_

## PHP code fixer

Εφόσον συνεισφέρετε κώδικα στο έργο αυτό, χρησιμοποιείστε το
[PHP Code Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer)
για ομογενοποίηση του κώδικα σύμφωνα με [κοινές προδιαγραφές](.php_cs)
για το έργο.

Για να εκτελέστε τον PHP Code Fixer από τη γραμμή εντολών:

```
<path-to>/php-cs-fixer fix ./src --config .php_cs
```
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# README

Παρακαλώ δείτε το [INSTALL.md](INSTALL.md) αρχείο για αρχικές οδηγίες εγκατάστασης.

## Τι είναι αυτό;

Εφαρμογή υποστήριξης διοικητικών διαδικασιών.
Expand All @@ -25,3 +23,8 @@

* δημιουργήσετε/τροποποιήσετε τους χρήστες της εφαρμογής
* επικοινωνήσετε με το διαχειριστή της εφαρμογής μέσω της αντίστοιχης σελίδας Επικοινωνία

## Περισσότερες πληροφορίες

* [INSTALL.md](INSTALL.md) αρχείο για αρχικές οδηγίες εγκατάστασης
* [CONTRIBUTING.md](CONTRIBUTING.md) αρχείο για πληροφορίες συνεισφοράς στο έργο
5 changes: 3 additions & 2 deletions yii2/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@
"kartik-v/yii2-datecontrol": "@dev",
"phpoffice/phpexcel": "1.8",
"phpoffice/phpword": "dev-master",
"spapad/yii2helpers": ">=1.1.1",
"spapad/yii2helpers": ">=1.1.3",
"bower-asset/sweetalert": "1.1.*",
"vova07/yii2-imperavi-widget": "^1.3",
"2amigos/yii2-file-upload-widget": "^1.0"
"2amigos/yii2-file-upload-widget": "^1.0",
"2amigos/yii2-switch-widget": "~1.0"
},
"require-dev": {
"yiisoft/yii2-debug": "*",
Expand Down
114 changes: 107 additions & 7 deletions yii2/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 22 additions & 1 deletion yii2/models/Specialisation.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace app\models;

use Yii;
use yii\helpers\ArrayHelper;

/**
* This is the model class for table "{{%specialisation}}".
Expand All @@ -16,6 +16,8 @@
class Specialisation extends \yii\db\ActiveRecord
{

public $label;

/**
* @inheritdoc
*/
Expand Down Expand Up @@ -46,6 +48,7 @@ public function attributeLabels()
'id' => Yii::t('app', 'ID'),
'code' => Yii::t('app', 'Code'),
'name' => Yii::t('app', 'SpecName'),
'label' => Yii::t('app', 'Specialisation label'),
];
}

Expand All @@ -57,6 +60,24 @@ public function getEmployees()
return $this->hasMany(Employee::className(), ['specialisation' => 'id']);
}

public function afterFind()
{
parent::afterFind();
$this->label = "{$this->code} {$this->name}";
}

/**
* Get a list of available choices in the form of
* ID => LABEL suitable for select lists.
*
*/
public static function selectables()
{
$choices_aq = new SpecialisationQuery(get_called_class());

return ArrayHelper::map($choices_aq->all(), 'id', 'label');
}

/**
* @inheritdoc
* @return AdmappSpecialisationQuery the active query used by this AR class.
Expand Down
124 changes: 124 additions & 0 deletions yii2/modules/SubstituteTeacher/controllers/CallController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?php

namespace app\modules\SubstituteTeacher\controllers;

use Yii;
use app\modules\SubstituteTeacher\models\Call;
use app\modules\SubstituteTeacher\models\CallSearch;
use yii\web\Controller;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;

/**
* CallController implements the CRUD actions for Call model.
*/
class CallController extends Controller
{
/**
* @inheritdoc
*/
public function behaviors()
{
return [
'verbs' => [
'class' => VerbFilter::className(),
'actions' => [
'delete' => ['POST'],
],
],
];
}

/**
* Lists all Call models.
* @return mixed
*/
public function actionIndex()
{
$searchModel = new CallSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);

return $this->render('index', [
'searchModel' => $searchModel,
'dataProvider' => $dataProvider,
]);
}

/**
* Displays a single Call model.
* @param integer $id
* @return mixed
*/
public function actionView($id)
{
return $this->render('view', [
'model' => $this->findModel($id),
]);
}

/**
* Creates a new Call model.
* If creation is successful, the browser will be redirected to the 'view' page.
* @return mixed
*/
public function actionCreate()
{
$model = new Call();

if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', 'id' => $model->id]);
} else {
return $this->render('create', [
'model' => $model,
]);
}
}

/**
* Updates an existing Call model.
* If update is successful, the browser will be redirected to the 'view' page.
* @param integer $id
* @return mixed
*/
public function actionUpdate($id)
{
$model = $this->findModel($id);

if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', 'id' => $model->id]);
} else {
return $this->render('update', [
'model' => $model,
]);
}
}

/**
* Deletes an existing Call model.
* If deletion is successful, the browser will be redirected to the 'index' page.
* @param integer $id
* @return mixed
*/
public function actionDelete($id)
{
$this->findModel($id)->delete();

return $this->redirect(['index']);
}

/**
* Finds the Call model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown.
* @param integer $id
* @return Call the loaded model
* @throws NotFoundHttpException if the model cannot be found
*/
protected function findModel($id)
{
if (($model = Call::findOne($id)) !== null) {
return $model;
} else {
throw new NotFoundHttpException('The requested page does not exist.');
}
}
}
Loading