diff --git a/application/modules/Asset/controllers/Asset.php b/application/modules/Asset/controllers/Asset.php index c3258b2..490ee10 100644 --- a/application/modules/Asset/controllers/Asset.php +++ b/application/modules/Asset/controllers/Asset.php @@ -188,8 +188,7 @@ public function deleteAsset($id) } - - + diff --git a/application/modules/Audit/models/Audit_model.php b/application/modules/Audit/models/Audit_model.php new file mode 100644 index 0000000..e6eb229 --- /dev/null +++ b/application/modules/Audit/models/Audit_model.php @@ -0,0 +1,20 @@ +db->select('A.* , user.name as user_name '); + $this->db->from('history A'); + $this->db->join('user', 'user.id = A.created_by', 'left'); + $this->db->where('A.business_id', $business_id); + $this->db->where('A.primary_id', $id); + $this->db->where('A.table_name', $table); + $query = $this->db->get(); + $query = $query->result(); + return $query; + } + + + + +} \ No newline at end of file diff --git a/application/modules/Dashboard/views/dashboard.php b/application/modules/Dashboard/views/dashboard.php index 1a39938..2b9ecaf 100644 --- a/application/modules/Dashboard/views/dashboard.php +++ b/application/modules/Dashboard/views/dashboard.php @@ -1,25 +1,680 @@ -

Dashboard

- '.$user.''; - } + + +
+
+
+ Total Assets +
2500
+ 4% From last Week +
+
+ Average Time +
123.50
+ 3% From last Week +
+
+ Total Males +
2,500
+ 34% From last Week +
+
+ Total Females +
4,567
+ 12% From last Week +
+
+ Total Collections +
2,315
+ 34% From last Week +
+
+ Total Connections +
7,325
+ 34% From last Week +
+
+
+ - foreach($address as $address1) - { - echo '

'.$address1.'

'; - } +
+
+
+ +
+
+

Network Activities Graph title sub-title

+
+
+
+ + December 30, 2014 - January 28, 2015 +
+
+
+ +
+
+
+
+
+

Top Campaign Performance

+
+
+ +
+
+

Facebook Campaign

+
+
+
+
+
+
+
+

Twitter Campaign

+
+
+
+
+
+
+
+
+
+

Conventional Media

+
+
+
+
+
+
+
+

Bill boards

+
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+
+ +
- ?> - history - -
-

LOGGEDIN :

-

IS_SUPERADMIN :

-

IS_ADMIN :

-

IS_USER :

-

USER :

-

SETTINGS :

-

BUSINESS :

-
\ No newline at end of file +
+
+
+

App Versions

+ +
+
+
+

App Usage across versions

+
+
+ 0.1.5.2 +
+
+
+
+ 60% Complete +
+
+
+
+ 123k +
+
+
+ +
+
+ 0.1.5.3 +
+
+
+
+ 60% Complete +
+
+
+
+ 53k +
+
+
+
+
+ 0.1.5.4 +
+
+
+
+ 60% Complete +
+
+
+
+ 23k +
+
+
+
+
+ 0.1.5.5 +
+
+
+
+ 60% Complete +
+
+
+
+ 3k +
+
+
+
+
+ 0.1.5.6 +
+
+
+
+ 60% Complete +
+
+
+
+ 1k +
+
+
+ +
+
+
+ +
+
+
+

Device Usage

+ +
+
+
+ + + + + + + + + +
+

Top 5

+ 		+
+

Device

+
+
+

Progress

+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+

IOS

+ 		30%
+

Android

+ 		10%
+

Blackberry

+ 		20%
+

Symbian

+ 		15%
+

Others

+ 		30%
+
+
+
+
+ + +
+
+
+

Quick Settings

+ +
+
+
+
+ + +
+

Profile Completion

+ +
+ 0 + % + 100% +
+
+
+
+
+
+ +
+ + +
+
+
+
+

Recent Activities Sessions

+ +
+
+
+
+ + +
+
+
+
+ + +
+ + + +
+ +
+
+
+

Visitors location geo-presentation

+ +
+
+
+
+
+

125.7k Views from 60 countries

+ + + + + + + + + + + + + + + + + + + + + + + + +
United States33%
France27%
Germany16%
Spain11%
Britain10%
+
+
+
+
+
+
+ +
+
+ + + +
+
+
+

To Do List Sample tasks

+ +
+
+
+ +
+
    +
  • +

    + Schedule meeting with new client

    +
    • +
  • +

    + Create email address for new intern

    +
    • +
  • +

    + Have IT fix the network printer

    +
    • +
  • +

    + Copy backups to offsite location

    +
    • +
  • +

    + Food truck fixie locavors mcsweeney

    +
    • +
  • +

    + Food truck fixie locavors mcsweeney

    +
    • +
  • +

    + Create email address for new intern

    +
    • +
  • +

    + Have IT fix the network printer

    +
    • +
  • +

    + Copy backups to offsite location

    +
    • +
+
+
+
+
+ + + +
+
+
+

Daily active users Sessions

+ +
+
+
+
+
+
Monday, 07:30 AM + F + C +
+
+
+
+
+
+ +
+
+
+
+

Texas
Partly Cloudy Day

+
+
+
+
+
+

23

+
+
+ +
+ +
+
+
+

Mon

+

25

+ +
15 km/h
+
+
+
+
+

Tue

+

25

+ +
12 km/h
+
+
+
+
+

Wed

+

27

+ +
14 km/h
+
+
+
+
+

Thu

+

28

+ +
15 km/h
+
+
+
+
+

Fri

+

28

+ +
11 km/h
+
+
+
+
+

Sat

+

26

+ +
10 km/h
+
+
+
+
+
+
+ +
+ +
+
+
+ + \ No newline at end of file