Merge pull request #163 from uplink42/dev

Updated global procedure. Fixed layout inconsistency with IE
uplink42 · Apr 23, 2017 · 2533880 · 2533880
2 parents 0fa5d4d + 432770d
commit 2533880
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 9 deletions.
diff --git a/application/controllers/Profits.php b/application/controllers/Profits.php
@@ -1,5 +1,6 @@
 <?php
 defined('BASEPATH') or exit('No direct script access allowed');
+ini_set('memory_limit','1G');
 
 final class Profits extends MY_Controller
 {
@@ -11,7 +12,6 @@ public function __construct()
         $this->load->model('Profits_model', 'profits');
     }
 
-
     /**
      * Loads the Profits page
      * @param  int         $character_id 

diff --git a/application/controllers/Transactions.php b/application/controllers/Transactions.php
@@ -1,5 +1,6 @@
 <?php
 defined('BASEPATH') or exit('No direct script access allowed');
+ini_set('memory_limit','512M');
 
 final class Transactions extends MY_Controller
 {

diff --git a/application/controllers/internal/Async_procedure.php b/application/controllers/internal/Async_procedure.php
@@ -44,9 +44,10 @@ public function index($iduser)
             log_message('error', $username . ' GLOBAL ERROR ->' . Msg::DB_ERROR);
         } else {
         	try {
-        		$this->Updater_model->calculateProfits();
-		        //totals and history
-		        $this->Updater_model->updateTotals(true, $username);
+                $this->load->model('Updater_profit_model', 'profits');
+                $this->profits->beginProfitCalculation($username);
+                // update totals and history
+                $this->Updater_model->updateTotals();
 		        // send email
                 $this->db->where('iduser', $iduser);
                 $query = $this->db->get('user');

diff --git a/application/models/internal/Autoexec_updater_model.php b/application/models/internal/Autoexec_updater_model.php
@@ -0,0 +1,30 @@
+<?php
+if (!defined('BASEPATH')) {
+    exit('No direct script access allowed');
+}
+
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+class Autoexec_updater_model extends CI_Model
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+
+    public function getAllUsers()
+    {
+        $this->db->select('username, iduser');
+        $this->db->from('user');
+        //$this->db->where('iduser <=', '1415');
+        $this->db->order_by('iduser', 'asc');
+        $query = $this->db->get();
+
+        $result = $query->result();
+
+        return $result;
+    }
+}
diff --git a/application/views/home/home_v.php b/application/views/home/home_v.php
@@ -16,12 +16,8 @@
         <div class="container">
             <div class="row">
                 <div class="col-md-12 intro-content">
-                    <div class="logo">
-                        <h1>ETM</h1>
-                    </div>
                     <div class="intro-text text-center">
                         <h2>Eve Trade Master 2.0</h2>
-
                         <p class="lead">a web based profit tracker, asset manager and much more!</p>
                     </div>
                     <div class="page-scroll">

diff --git a/assets/luna/styles/sass/partials/_body.scss b/assets/luna/styles/sass/partials/_body.scss
@@ -41,7 +41,7 @@ body {
 }
 
 .navbar-fixed-top {
-  position: initial;
+  position: inherit;
   margin-bottom: 0;
 }