Issue Fixation and readme updated

Orangescrum · Apr 20, 2022 · 2f9592f · 2f9592f
1 parent 9f473d1
commit 2f9592f
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 141 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,13 @@
+![Orangescrum Logo](https://www.orangescrum.com/blog/wp-content/uploads/2022/04/Orangescrum-Logo.png)
+
+
+![GitHub all releases](https://img.shields.io/github/downloads/orangescrum/orangescrum/total)
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/orangescrum/orangescrum)
+![GitHub commit activity](https://img.shields.io/github/commit-activity/m/orangescrum/orangescrum)
+![GitHub repo size](https://img.shields.io/github/repo-size/orangescrum/orangescrum)
+![GitHub issues](https://img.shields.io/github/issues/orangescrum/orangescrum)
+![GitHub closed issues](https://img.shields.io/github/issues-closed/orangescrum/orangescrum)
 
-## Readme:
 
 # [](https://github.com/Orangescrum/orangescrum/blob/main/README.md#free-open-source-project-management-software)Free, open source Project Management software
 
@@ -9,7 +17,7 @@ Orangescrum is the simple yet powerful free and open source project management s
 
 Orangescrum open-source is a flexible project management web application written using CakePHP.
 
-New features, enhancements, and updates released on a regular basis.
+New features, enhancements, and updates are released on a regular basis.
 
 Pull requests and bug reports are always welcome!
 
@@ -38,6 +46,12 @@ The key features are:
 - [Default Status Workflow](https://www.orangescrum.com/custom-status-workflow)
 - [Default User Role Management](https://www.orangescrum.com/user-role-management)
 
+![TaskList](https://user-images.githubusercontent.com/104009174/164024431-7a2aa224-f01a-4a89-a04f-edfdc7a64180.png)
+![Task](https://user-images.githubusercontent.com/104009174/164024438-ba48ce20-eb87-4268-be2a-b6f3b9e64108.png)
+![TaskDetail](https://user-images.githubusercontent.com/104009174/164024414-8a4d6117-b200-409d-9cf4-0f3d1585a76d.png)
+![Project](https://user-images.githubusercontent.com/104009174/164024428-a42a6b4b-8c48-49f9-a65d-c463eb78d578.png)
+![DashBoard](https://user-images.githubusercontent.com/104009174/164024434-c8821926-b57f-4f53-9136-e4da33fc6304.png)
+
 We use Orangescrum in our daily jobs to manage our customers information, projects. It is deployed in the production environment of our premium users, and we supported several organizations to deploy this community version on their servers as well. We take care of our open source edition similar than we do for our cloud/enterprise self-hosted edition, in fact both of them use the same code base structure. So feel free to use it in your organization or business!
 
 ## [](https://github.com/Orangescrum/orangescrum/blob/main/README.md#system-requirements)System Requirements
@@ -62,19 +76,19 @@ We use Orangescrum in our daily jobs to manage our customers information, projec
     -   `app/Config/constants.php`  - Update the FROM_EMAIL_NOTIFY and SUPPORT_EMAIL [Required]
 -   Run the application as  [https://www.your-site.com/](http://your-site.com/)  from your browser and start using Orangescrum
 
-For more information please visit below link:  [https://www.orangescrum.com/general-installation-guide](http://orangescrum.com/general-installation-guide)
+For more information please visit below link:  [https://www.orangescrum.com/open-source/general-installation-guide](http://orangescrum.com/open-source/general-installation-guide)
 
 ## [](https://github.com/Orangescrum/orangescrum/blob/main/README.md#updates)Updates
 
 New features, enhancements, and updates appear on a regular basis. You just need to follow these checkpoints:
 
-Make sure to take a backup of your database and files Replace all files in your directory with the updated version If there were any database changes, the system will redirect your to <yourdomain.com>/update
+Make sure to take a backup of your database and files Replace all files in your directory with the updated version.
 
 Users can check the new releases at:  [https://www.orangescrum.com/open-source/release-notes](http://orangescrum.com/open-source/release-notes)
 
 ## [](https://github.com/Orangescrum/orangescrum/blob/main/README.md#community)Community
 
-Need help to set up Orangescrum? Want to know more about cool enhancements? Feel free to visit our [community support](https://groups.google.com/g/orangescrum-community-support). You can also subscribe to our [newsletter](https://orangescrum.com/blog/) to get any important announcements and releases. 
+Need help to set up Orangescrum? Want to know more about cool enhancements? Feel free to visit our [community forum](https://groups.google.com/g/orangescrum-community-support). You can also subscribe to our [newsletter](https://orangescrum.com/blog/) to get any important announcements and releases. 
 
 ## [](https://github.com/Orangescrum/orangescrum/blob/main/README.md#report-bugs)Report bugs
 
@@ -90,5 +104,4 @@ Get in touch with us here. We are available for any type of support, queries or
 
 ## [](https://github.com/Orangescrum/orangescrum/blob/main/README.md#about)About
 
-Orangescrum open-source project management software is ideal for small teams or for individual usage.
-
+Orangescrum open-source project management software is ideal for small teams or for individual usage.
diff --git a/app/Controller/Component/PostcaseComponent.php b/app/Controller/Component/PostcaseComponent.php
@@ -1790,10 +1790,10 @@ public function removeFiles($caseFileids, $easycaseid, $chk=0)
             $data['CaseRemovedFile']['user_id'] = SES_ID;
             $data['CaseRemovedFile']['company_id'] = SES_COMP;
             $data['CaseRemovedFile']['case_file_name'] = !empty($val['CaseFile']['upload_name'])?$val['CaseFile']['upload_name']:$val['CaseFile']['file'];
-            $cnt = $ProjectTemplateCaseFile->find('count', array('conditions' => array('ProjectTemplateCaseFile.upload_name' => $data['CaseRemovedFile']['case_file_name'])));
-            if ($cnt ==0) {
+            // $cnt = $ProjectTemplateCaseFile->find('count', array('conditions' => array('ProjectTemplateCaseFile.upload_name' => $data['CaseRemovedFile']['case_file_name'])));
+            // if ($cnt ==0) {
                 $caseRemovedFile->save($data);
-            }
+            // }
         }
         if ($caseFile->deleteAll(array('CaseFile.id' => $delids, 'CaseFile.company_id' => SES_COMP, 'CaseFile.easycase_id' => $easycaseid))) {
             $cur_data = $easycase->find('first', array('conditions' => array('Easycase.id' => $easycaseid), 'fields' => array('Easycase.id','Easycase.case_no', 'Easycase.project_id', 'Easycase.thread_count','Easycase.format', 'Easycase.message','Easycase.istype')));

diff --git a/app/Controller/EasycasesController.php b/app/Controller/EasycasesController.php
@@ -8516,21 +8516,6 @@ public function move_task_to_project()
         $cond = ' 1 ';
         $postdata = $this->data;
         $this->loadModel('Project');
-        $this->loadModel('EasycaseLabel');
-        $this->loadModel('Label');
-        if ($postdata['is_multiple'] == '1') {
-            $params['conditions'][] = array('EasycaseLabel.easycase_id IN' => $postdata['case_id'],'EasycaseLabel.project_id' => $postdata['old_project_id']);
-        } else {
-            $params['conditions'][] = array('EasycaseLabel.easycase_id' => $postdata['case_id'],'EasycaseLabel.project_id' => $postdata['old_project_id']);
-        }
-        $labels = $this->EasycaseLabel->find('all', $params);
-        $labelCondition['conditions'][] = array('Label.project_id IN' => [$postdata['case_id'],'0'],'Label.company_id'=>[SES_COMP]);
-        $labelCondition['fields'] = array('Label.lbl_title','Label.id');
-        // echo "<pre>"; print_r($labelCondition); exit;
-        $label_exist = $this->Label->find('list', $labelCondition);
-        //echo "<pre>"; print_r($label_exist); exit;
-
-        $this->EasycaseLabel->saveLabelOtherProject($labels, $label_exist, $postdata);
         // if(!$this->Project->compareProjectStatusgroup($old_project_id, $project_id)){
         // 	echo json_encode(array('success' => 0,'msg'=>__('Can not move task to a project having different status workflow.')));
         // 	exit;

diff --git a/app/Controller/ProjectsController.php b/app/Controller/ProjectsController.php
@@ -5793,12 +5793,9 @@ public function export_csv_projectlist()
         $this->loadModel('User');
         $prjmanager_names = $this->User->find('list', array('fields' => array('User.uniq_id', 'User.name')));
 
-        $this->loadModel('InvoiceCustomer');
-        $inv_user_list = $this->InvoiceCustomer->find('all', array('fields' => array("id", "first_name","last_name")));
+
         $user_list=array();
-        foreach ($inv_user_list as $key=>$val) {
-            $user_list[$val['InvoiceCustomer']['id']]=$val['InvoiceCustomer']['first_name'].' '.$val['InvoiceCustomer']['last_name'];
-        }
+
         // $user_list = $this->User->find('list', array('fields' => array('User.id', 'User.name')));
         $this->loadModel('Industry');
         $industries = $this->Industry->find('list', array('conditions' => array('Industry.is_display' => 1),'fields' => array('Industry.id', 'Industry.name')));
@@ -7888,7 +7885,6 @@ public function sendEmailToUser($user_id, $approver_id, $approver_week_start, $a
         }
         $sts_txt = $status == 2 ? __("Approved") : __("Rejected");
         $subject = "Timesheet Approval Status (" . $startEmailDate . " - " . $endEmailDate . " " . $endEmailDateYear . ") ";
-        // $approver_ses_email = "chandan.pattnaik@andolasoft.co.in";
         $this->Email->delivery = 'smtp';
         $this->Email->to = $ses_email;
 

diff --git a/app/View/Elements/case_list_tr.ctp b/app/View/Elements/case_list_tr.ctp
@@ -104,32 +104,14 @@
                                 <% } %>
                                 <% } %>
 								<% if(isAllowed("Create Task",projectUniqid)){ %>
-                                    <% 
-
-									if((caseDet.Easycase.is_sub_sub_task==null) || (caseDet.Easycase.is_sub_sub_task=='')){
-									if(caseLegend !=3 && caseTypeId != 10){ %>
-                                    <li onclick="addSubtaskPopup(<%= '\'' + projectUniqid + '\'' %>,<%= '\'' + caseDet.Easycase.id + '\'' %>,<%= '\'' + caseDet.Easycase.project_id + '\'' %>,<%= '\'' + caseDet.Easycase.uniq_id + '\'' %>,<%= '\'' + caseDet.Easycase.title + '\'' %>);trackEventLeadTracker(<%= '\'Task List Page\'' %>,<%= '\'Create Sub task\'' %>,<%= '\'<?php echo $_SESSION['SES_EMAIL_USER_LOGIN'];?>\'' %>);">
-                                        <a href="javascript:void(0);"><i class="material-icons"></i><?php echo __('Create Subtask');?></a>
-                                    </li>
-                                    <% } }%>
                           <% } %>
 					<% if(caseParenId){ %>
 					<% if(isAllowed("Change Other Details of Task",projectUniqid)){ %>
 
-                                        <li onclick="convertToParentTask(<%= '\''+ caseAutoId+'\',\''+caseNo+'\'' %>);trackEventLeadTracker(<%= '\'Task List Page\'' %>,<%= '\'Convert To Parent Task\'' %>,<%= '\'<?php echo $_SESSION['SES_EMAIL_USER_LOGIN'];?>\'' %>);" id="convertToTask<%= caseAutoId %>" style=" <% if(showQuickActiononList){ %>display:block <% } else { %>display:none<% } %>">
-                                              <a href="javascript:void(0);"><i class="material-icons">&#xE15A;</i><?php echo __('Convert To Parent');?></a>
-                                        </li>
+
 
 					<% } } %>
-									  <% if(caseParenId == "" || caseParenId == null){ %>
-									  <%	if((caseDet.Easycase.sub_sub_task==null) || (caseDet.Easycase.sub_sub_task =="") || (caseDet.Easycase.sub_sub_task ==0)){  %>
-										  <% if(isAllowed("Change Other Details of Task",projectUniqid)){ %>
-                                        <li onclick="convertToSubTask(<%= '\''+ caseAutoId+'\',\''+projId+'\',\''+caseNo+'\'' %>);trackEventLeadTracker(<%= '\'Task List Page\'' %>,<%= '\'Convert To Sub Task\'' %>,<%= '\'<?php echo $_SESSION['SES_EMAIL_USER_LOGIN'];?>\'' %>);" id="convertToSubTask<%= caseAutoId %>" style=" <% if(showQuickActiononList){ %>display:block <% } else { %>display:none<% } %>">
-                                              <a href="javascript:void(0);"><i class="material-icons">&#xE15A;</i><?php echo __('Convert To Subtask');?></a>
-                                        </li>
-
 
-										  <% } } } %>
                                     <?php if($GLOBALS['user_subscription']['subscription_id'] != CURRENT_EXPIRED_PLAN){ ?>
                                     <% if(isAllowed('Manual Time Entry',projectUniqid)){ %>
 									<% if(caseLegend == 3){ %>
@@ -299,34 +281,7 @@
                                 <% } %>
                                 <% } %>
                     <% } %>
-                    <% } %>
-					<% if(isAllowed("Create Task",projectUniqid)){ %>
-                                    <% 
-
-									if((caseDet.Easycase.is_sub_sub_task==null) || (caseDet.Easycase.is_sub_sub_task=='')){
-									if(caseLegend !=3 && caseTypeId != 10){ %>
-                                    <li onclick="addSubtaskPopup(<%= '\'' + projectUniqid + '\'' %>,<%= '\'' + caseDet.Easycase.id + '\'' %>,<%= '\'' + caseDet.Easycase.project_id + '\'' %>,<%= '\'' + caseDet.Easycase.uniq_id + '\'' %>,<%= '\'' + caseDet.Easycase.title + '\'' %>);trackEventLeadTracker(<%= '\'Task List Page\'' %>,<%= '\'Create Sub task\'' %>,<%= '\'<?php echo $_SESSION['SES_EMAIL_USER_LOGIN'];?>\'' %>);">
-                                        <a href="javascript:void(0);"><i class="material-icons"></i><?php echo __('Create Subtask');?></a>
-                                    </li>
-                                    <% } }%>
-                          <% } %>
-					<% if(caseParenId){ %>
-					<% if(isAllowed("Change Other Details of Task",projectUniqid)){ %>
-
-                                        <li onclick="convertToParentTask(<%= '\''+ caseAutoId+'\',\''+caseNo+'\'' %>);trackEventLeadTracker(<%= '\'Task List Page\'' %>,<%= '\'Convert To Parent Task\'' %>,<%= '\'<?php echo $_SESSION['SES_EMAIL_USER_LOGIN'];?>\'' %>);" id="convertToTask<%= caseAutoId %>" style=" <% if(showQuickActiononList){ %>display:block <% } else { %>display:none<% } %>">
-                                              <a href="javascript:void(0);"><i class="material-icons">&#xE15A;</i><?php echo __('Convert To Parent');?></a>
-                                        </li>
-
-					<% } } %>
-									  <% if(caseParenId == "" || caseParenId == null){ %>
-									  <%	if((caseDet.Easycase.sub_sub_task==null) || (caseDet.Easycase.sub_sub_task =="") || (caseDet.Easycase.sub_sub_task ==0)){  %>
-										  <% if(isAllowed("Change Other Details of Task",projectUniqid)){ %>
-                                        <li onclick="convertToSubTask(<%= '\''+ caseAutoId+'\',\''+projId+'\',\''+caseNo+'\'' %>);trackEventLeadTracker(<%= '\'Task List Page\'' %>,<%= '\'Convert To Sub Task\'' %>,<%= '\'<?php echo $_SESSION['SES_EMAIL_USER_LOGIN'];?>\'' %>);" id="convertToSubTask<%= caseAutoId %>" style=" <% if(showQuickActiononList){ %>display:block <% } else { %>display:none<% } %>">
-                                              <a href="javascript:void(0);"><i class="material-icons">&#xE15A;</i><?php echo __('Convert To Subtask');?></a>
-                                        </li>
-
-
-										  <% } } } %>
+                    <% } %>	 
                                 <?php if($GLOBALS['user_subscription']['subscription_id'] != CURRENT_EXPIRED_PLAN){ ?>
                                     <% if(isAllowed("Manual Time Entry",projectUniqid)){ %>
 									<% if(caseLegend == 3){ %>