From 106788fa590410246612a837e9d8532c0ab22b19 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 20 Jul 2022 06:22:59 +0000
Subject: [PATCH 1/2] * Finish task #61442.

---
 extension/lite/attend/ext/view/personal.html.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/extension/lite/attend/ext/view/personal.html.php b/extension/lite/attend/ext/view/personal.html.php
index 0aba583577..3c283d81a9 100644
--- a/extension/lite/attend/ext/view/personal.html.php
+++ b/extension/lite/attend/ext/view/personal.html.php
@@ -158,6 +158,16 @@
                   <?php elseif(strpos(',rest,normal,', ",$status,") === false):?>
                   <?php if($reviewStatus == 'wait' or strpos(',late,early,both,', ",$status,") !== false):?>
                   <?php echo baseHTML::a($this->createLink('attend', 'edit', "date=" . $date), $edit, "data-toggle='modal' data-width='500px'");?>
+                  <?php elseif(!empty($reason)):?>
+                  <span class='attend-<?php echo $status;?>'>
+                      <?php if($reason == 'normal')   extCommonModel::printLink('attend',   'edit',   "date=" . $date, $edit,     "data-toggle='modal' data-width='500px'");?>
+                      <?php if($reason == 'leave')    extCommonModel::printLink('leave',    'create', "date=" . $date, $leave,    "data-toggle='modal' data-width='700px'");?>
+                      <?php if($reason == 'makeup')   extCommonModel::printLink('makeup',   'create', "date=" . $date, $makeup,   "data-toggle='modal' data-width='700px'");?>
+                      <?php if($reason == 'overtime') extCommonModel::printLink('overtime', 'create', "date=" . $date, $overtime, "data-toggle='modal' data-width='700px'");?>
+                      <?php if($reason == 'lieu')     extCommonModel::printLink('lieu',     'create', "date=" . $date, $lieu,     "data-toggle='modal' data-width='700px'");?>
+                      <?php if($reason == 'trip')     extCommonModel::printLink('trip',     'create', "date=" . $date, $trip,     "data-toggle='modal' data-width='700px'");?>
+                      <?php if($reason == 'egress')   extCommonModel::printLink('egress',   'create', "date=" . $date, $egress,   "data-toggle='modal' data-width='700px'");?>
+                  </span>
                   <?php else:?>
                   <div class='dropdown'>
                     <a href='javascript:;' data-toggle='dropdown'><?php echo $lang->actions;?><span class='caret'></span></a>

From a49f1b99610d6a6e8a50af880bcf95a751d1f92e Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 21 Jul 2022 01:38:12 +0000
Subject: [PATCH 2/2] * Finish task #61442.

---
 extension/lite/attend/ext/view/personal.html.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/extension/lite/attend/ext/view/personal.html.php b/extension/lite/attend/ext/view/personal.html.php
index 3c283d81a9..4815bfeb3b 100644
--- a/extension/lite/attend/ext/view/personal.html.php
+++ b/extension/lite/attend/ext/view/personal.html.php
@@ -151,6 +151,10 @@
                   <span class='attend-<?php echo $status;?>'>
                     <?php extCommonModel::printLink('leave', 'create', "date=" . $date, $leave, "data-toggle='modal' data-width='700px'");?>
                   </span>
+                  <?php elseif($status == 'overtime'):?>
+                  <span class='attend-<?php echo $status;?>'>
+                    <?php extCommonModel::printLink('overtime', 'create', "date=" . $date, $overtime, "data-toggle='modal' data-width='700px'");?>
+                  </span>
                   <?php elseif($status == 'lieu'):?>
                   <span class='attend-<?php echo $status;?>'>
                   <?php extCommonModel::printLink('lieu', 'create', "date=" . $date, $lieu, "data-toggle='modal' data-width='700px'");?>
@@ -158,16 +162,6 @@
                   <?php elseif(strpos(',rest,normal,', ",$status,") === false):?>
                   <?php if($reviewStatus == 'wait' or strpos(',late,early,both,', ",$status,") !== false):?>
                   <?php echo baseHTML::a($this->createLink('attend', 'edit', "date=" . $date), $edit, "data-toggle='modal' data-width='500px'");?>
-                  <?php elseif(!empty($reason)):?>
-                  <span class='attend-<?php echo $status;?>'>
-                      <?php if($reason == 'normal')   extCommonModel::printLink('attend',   'edit',   "date=" . $date, $edit,     "data-toggle='modal' data-width='500px'");?>
-                      <?php if($reason == 'leave')    extCommonModel::printLink('leave',    'create', "date=" . $date, $leave,    "data-toggle='modal' data-width='700px'");?>
-                      <?php if($reason == 'makeup')   extCommonModel::printLink('makeup',   'create', "date=" . $date, $makeup,   "data-toggle='modal' data-width='700px'");?>
-                      <?php if($reason == 'overtime') extCommonModel::printLink('overtime', 'create', "date=" . $date, $overtime, "data-toggle='modal' data-width='700px'");?>
-                      <?php if($reason == 'lieu')     extCommonModel::printLink('lieu',     'create', "date=" . $date, $lieu,     "data-toggle='modal' data-width='700px'");?>
-                      <?php if($reason == 'trip')     extCommonModel::printLink('trip',     'create', "date=" . $date, $trip,     "data-toggle='modal' data-width='700px'");?>
-                      <?php if($reason == 'egress')   extCommonModel::printLink('egress',   'create', "date=" . $date, $egress,   "data-toggle='modal' data-width='700px'");?>
-                  </span>
                   <?php else:?>
                   <div class='dropdown'>
                     <a href='javascript:;' data-toggle='dropdown'><?php echo $lang->actions;?><span class='caret'></span></a>