Commit bd49c377 by Kunj Gupta

Added static page of Reports.

parent 3816137d
......@@ -88,30 +88,35 @@ android {
}
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
compile 'com.jakewharton:butterknife:8.8.1'
compile 'com.google.android.gms:play-services-analytics:15.0.0'
compile 'com.googlecode.android-query:android-query:0.25.9'
//compile 'com.google.dagger:dagger:2.0'
//annotationProcessor 'com.google.dagger:dagger-compiler:2.0'
implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.12'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1'
implementation 'com.jakewharton:butterknife:8.8.1'
implementation 'com.google.android.gms:play-services-analytics:15.0.2'
implementation 'com.googlecode.android-query:android-query:0.25.9'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
compile('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
transitive = true;
}
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.github.nkzawa:socket.io-client:0.3.0'
compile 'com.android.support:appcompat-v7:27.1.1'
compile 'com.android.support:cardview-v7:27.1.1'
compile 'com.android.support:recyclerview-v7:27.1.1'
compile 'com.android.support:animated-vector-drawable:27.1.1'
compile 'com.android.support:support-media-compat:27.1.1'
compile 'com.android.support:support-v4:27.1.1'
compile 'com.google.firebase:firebase-messaging:15.0.0'
implementation 'com.squareup.picasso:picasso:2.5.2'
implementation 'com.github.nkzawa:socket.io-client:0.3.0'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
implementation 'com.android.support:animated-vector-drawable:27.1.1'
implementation 'com.android.support:support-media-compat:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.google.firebase:firebase-messaging:15.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
//static Reports Screen
implementation 'com.numetriclabz.numandroidcharts:numandroidcharts:1.0.9'
implementation 'info.hoang8f:android-segmented:1.0.6'
implementation 'com.github.PhilJay:MPAndroidChart:v2.1.6'
implementation 'com.android.support:multidex:1.0.3'
}
apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
......@@ -8,6 +8,7 @@ import android.content.IntentFilter;
import android.database.sqlite.SQLiteDatabase;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.support.multidex.MultiDexApplication;
import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;
import android.widget.Toast;
......@@ -34,7 +35,7 @@ import java.net.URISyntaxException;
import io.fabric.sdk.android.Fabric;
public class CatalogueApplication extends Application {
public class CatalogueApplication extends MultiDexApplication {
private static DBManager sDBManager;
private ConnectivityManager mConMgr;
......
package com.vsoft.servicenow.menu;
import android.os.Parcel;
import android.os.Parcelable;
import com.vsoft.servicenow.ui.ReportScreen;
/**
* Created by Kunj on 23/03/18.
*/
public class ReportsMenuItemData extends HomeScreenMenuItemData implements Parcelable {
protected ReportsMenuItemData() {
}
protected ReportsMenuItemData(Parcel in) {
super(in);
}
public static final Creator<ReportsMenuItemData> CREATOR = new Creator<ReportsMenuItemData>() {
@Override
public ReportsMenuItemData createFromParcel(Parcel in) {
return new ReportsMenuItemData(in);
}
@Override
public ReportsMenuItemData[] newArray(int size) {
return new ReportsMenuItemData[size];
}
};
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);
}
@Override
public int describeContents() {
return 0;
}
public static class Builder extends HomeScreenMenuItemData.Builder<Builder> {
public Builder() {
item = new ReportsMenuItemData();
setActivity(ReportScreen.class);
}
}
}
package com.vsoft.servicenow.ui;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.widget.Spinner;
import com.github.mikephil.charting.data.LineData;
import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.data.PieData;
import com.github.mikephil.charting.data.PieDataSet;
import com.github.mikephil.charting.utils.ColorTemplate;
import com.google.android.gms.analytics.Tracker;
import com.numetriclabz.numandroidcharts.AreaChart;
import com.vsoft.servicenow.CatalogueApplication;
import com.vsoft.servicenow.R;
import com.vsoft.servicenow.utils.Util;
import java.util.ArrayList;
import java.util.List;
import com.github.mikephil.charting.charts.LineChart;
import com.github.mikephil.charting.charts.PieChart;
import com.github.mikephil.charting.data.Entry;
import com.numetriclabz.numandroidcharts.ChartData;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* Created by chaukadev on 5/3/18.
*/
public class ReportScreen extends AppCompatActivity {
@BindView(R.id.tool_bar_view) Toolbar mToolbar;
private Spinner application_type;
@Override
protected void onCreate(Bundle savedInstanceState) {
// TODO Auto-generated method stub
super.onCreate(savedInstanceState);
setContentView(R.layout.reprots_screen);
ButterKnife.bind(this);
setSupportActionBar(mToolbar);
ActionBar actionBar = getSupportActionBar();
if(actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setElevation(0);
actionBar.setTitle(R.string.reports_screen_title_string);
actionBar.setDisplayShowHomeEnabled(false);
actionBar.setDisplayShowTitleEnabled(true);
}
CatalogueApplication application = (CatalogueApplication) getApplication();
Tracker tracker = application.getDefaultTracker();
// Send initial screen view hit.
Util.sendScreenName(tracker, actionBar.getTitle().toString());
application_type = findViewById(R.id.application_type);
application_type.setSelection(1);
LineChart lineChart = (LineChart) findViewById(R.id.line_chart);
PieChart pieChart1 = (PieChart) findViewById(R.id.pie1);
PieChart pieChart2 = (PieChart) findViewById(R.id.pie2);
PieChart pieChart3 = (PieChart) findViewById(R.id.pie3);
AreaChart areaChart = (AreaChart) findViewById(R.id.area_chart);
// creating list of entry
ArrayList<Entry> entries = new ArrayList<>();
entries.add(new Entry(4f, 0));
entries.add(new Entry(8f, 1));
entries.add(new Entry(6f, 2));
entries.add(new Entry(2f, 3));
entries.add(new Entry(18f, 4));
entries.add(new Entry(9f, 5));
ArrayList<String> labels = new ArrayList<String>();
labels.add("January");
labels.add("February");
labels.add("March");
labels.add("April");
labels.add("May");
labels.add("June");
ArrayList<Entry> entriesPie = new ArrayList<>();
entriesPie.add(new Entry(4f, 0));
entriesPie.add(new Entry(8f, 1));
entriesPie.add(new Entry(6f, 2));
ArrayList<String> labelsPie = new ArrayList<String>();
labelsPie.add("January");
labelsPie.add("February");
labelsPie.add("March");
LineDataSet lineDataset = new LineDataSet(entries, "");
lineDataset.setFillAlpha(100);
LineData lineData = new LineData(labels, lineDataset);
lineChart.setData(lineData); // set the data and list of lables into chart
lineChart.animateY(5000);
PieDataSet pieDataSet = new PieDataSet(entriesPie, "");
pieDataSet.setColors(ColorTemplate.JOYFUL_COLORS);
PieData pieData = new PieData(labelsPie, pieDataSet);
pieChart1.setData(pieData);
pieChart2.setData(pieData);
pieChart3.setData(pieData);
pieChart1.animateY(5000);
pieChart2.animateY(5000);
pieChart3.animateY(5000);
pieChart1.getLegend().setEnabled(false);
pieChart2.getLegend().setEnabled(false);
pieChart3.getLegend().setEnabled(false);
pieChart1.setDescription("");
pieChart2.setDescription("");
pieChart3.setDescription("");
lineChart.setDescription("");
List<ChartData> value1 = new ArrayList<>();
value1.add(new ChartData(4f, 0.5f)); //values.add(new ChartData(y,x));
value1.add(new ChartData(9f, 1f));
value1.add(new ChartData(18f, 2f));
value1.add(new ChartData(2f, 4f));
value1.add(new ChartData(12f, 5f));
value1.add(new ChartData(9f, 7f));
List<ChartData> value2 = new ArrayList<>();
value2.add(new ChartData(5f, 1f)); //values.add(new ChartData(y,x));
value2.add(new ChartData(6f, 2f));
value2.add(new ChartData(15f, 3f));
value2.add(new ChartData(2f, 5f));
value2.add(new ChartData(3f, 8f));
List<ChartData> value3 = new ArrayList<>();
value3.add(new ChartData(value1));
value3.add(new ChartData(value2));
areaChart.setData(value3);
List<String> type = new ArrayList<>();
type.add("January");
type.add("Frebruary");
areaChart.setLegends(type);
}
@Override
public boolean onOptionsItemSelected(MenuItem menuItem) {
if (menuItem.getItemId() == android.R.id.home) {
finish();
}
return super.onOptionsItemSelected(menuItem);
}
}
......@@ -194,4 +194,7 @@
<string name="pending_approvals_reject_string">Reject</string>
<string name="pending_approvals_dialog_message_string"><![CDATA[%1$s<br><b>Opened For </b>%2$s<br><b>Opened on </b>%3$s]]></string>
<string name="pending_approval_dialog_comment_hint_text">Comments</string>
<!--Report Screen-->
<string name="reports_screen_title_string">Reports</string>
</resources>
......@@ -36,6 +36,10 @@
android:name="com.vsoft.servicenow.ui.PendingApprovalsActivity"
android:screenOrientation="portrait"/>
<activity
android:name="com.vsoft.servicenow.ui.ReportScreen"
android:screenOrientation="portrait"/>
<service android:name=".service.NotificationInstanceIdService"
android:exported="false">
<intent-filter>
......
......@@ -9,6 +9,7 @@ import com.vsoft.servicenow.menu.MyRequestMenuItemData;
import com.vsoft.servicenow.menu.NotificationMenuItemData;
import com.vsoft.servicenow.menu.OrderServicesMenuItemData;
import com.vsoft.servicenow.menu.ReportIncidentMenuItemData;
import com.vsoft.servicenow.menu.ReportsMenuItemData;
import com.vsoft.servicenow.menu.ViewHRCaseMenuItemData;
import java.util.Arrays;
......@@ -48,6 +49,10 @@ public class MenuProvider {
.setTitle(R.string.home_screen_chat_title)
.setMenuIconResId(R.string.home_screen_chat_icon)
.build(),
new ReportsMenuItemData.Builder()
.setTitle(R.string.home_screen_reports_title)
.setMenuIconResId(R.string.home_screen_reports_icon)
.build(),
new NotificationMenuItemData.Builder()
.setTitle(R.string.home_screen_notification_title)
.setMenuIconResId(R.string.home_screen_notification_icon)
......
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillColor="#26A69A"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
</vector>
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:endColor="#FFF"
android:centerColor="#FFF"
android:startColor="#FFF"
android:angle="270" />
<corners
android:radius="5dp" />
<stroke android:color="@color/colorAccent"
android:width="1dp"></stroke>
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
\ No newline at end of file
......@@ -5,4 +5,9 @@
<item>2d4bb88e4f4a020020280ea28110c7f9</item>
<item>2d6b51924f8286005e1a3d728110c74a</item>
</string-array>
<string-array name="application_type">
<item>-Select Application-</item>
<item>Corporate Applications</item>
</string-array>
</resources>
\ No newline at end of file
......@@ -29,5 +29,8 @@
<string name="home_screen_approvals_title">Approvals</string>
<string name="home_screen_approvals_icon">approvals</string>
<string name="home_screen_reports_title">Reports</string>
<string name="home_screen_reports_icon">reports</string>
<!--End-->
</resources>
......@@ -4,9 +4,11 @@ buildscript {
repositories {
jcenter()
google()
mavenCentral()
maven { url "https://jitpack.io" }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.1'
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.google.gms:google-services:3.1.0'
......@@ -18,10 +20,14 @@ buildscript {
allprojects {
repositories {
jcenter()
mavenCentral()
maven {
url "https://maven.google.com"
}
maven { url "https://jitpack.io" }
maven {//static reports screen
url 'https://dl.bintray.com/sj/maven/'
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment