diff --git a/application/controllers/lehre/lehrauftrag/Lehrauftrag.php b/application/controllers/lehre/lehrauftrag/Lehrauftrag.php index bd71a0421..45a457ed8 100644 --- a/application/controllers/lehre/lehrauftrag/Lehrauftrag.php +++ b/application/controllers/lehre/lehrauftrag/Lehrauftrag.php @@ -143,6 +143,7 @@ class Lehrauftrag extends Auth_Controller $json []= array( 'row_index' => $lehrauftrag['row_index'], 'bestellt' => date('Y-m-d'), + 'vertrag_betrag' => $betrag, 'erteilt' => null ); } @@ -165,7 +166,8 @@ class Lehrauftrag extends Auth_Controller { $json []= array( 'row_index' => $lehrauftrag['row_index'], - 'bestellt' => date('Y-m-d') + 'bestellt' => date('Y-m-d'), + 'vertrag_betrag' => $betrag ); } diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php index 1a209aa8b..2d0ac1007 100644 --- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php +++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php @@ -236,9 +236,12 @@ $this->load->view( // Performes after row was updated function func_rowUpdated(row){ - // Deselect and disable new selection of updated rows (ordering done) + + // Refresh status icon and row color + row.reformat(); // retriggers cell formatters and rowFormatter callback + + // Deselect and disable new selection of updated rows row.deselect(); - row.getElement().style["background-color"] = COLOR_LIGHTGREY; row.getElement().style["pointerEvents"] = "none"; } diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php index 82494e865..0d88944bd 100644 --- a/application/views/lehre/lehrauftrag/approveLehrauftrag.php +++ b/application/views/lehre/lehrauftrag/approveLehrauftrag.php @@ -282,9 +282,12 @@ $this->load->view( // Performes after row was updated function func_rowUpdated(row){ - // Deselect and disable new selection of updated rows (ordering done) + + // Refresh status icon and row color + row.reformat(); // retriggers cell formatters and rowFormatter callback + + // Deselect and disable new selection of updated rows row.deselect(); - row.getElement().style["background-color"] = COLOR_LIGHTGREY; row.getElement().style["pointerEvents"] = "none"; } diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php index 43ac1890a..0d800cf17 100644 --- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php +++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php @@ -293,9 +293,15 @@ $this->load->view( // Performes after row was updated function func_rowUpdated(row){ + + // Refresh status icon and row color + row.reformat(); // retriggers cell formatters and rowFormatter callback + + // Format font-weight normal (needed after geaenderte were bestellt) + row.getElement().style['font-weight'] = 'normal'; + // Deselect and disable new selection of updated rows (ordering done) row.deselect(); - row.getElement().style["background-color"] = COLOR_LIGHTGREY; row.getElement().style["pointerEvents"] = "none"; }