Skip to content

GitLab

Commit 90efaeb8 authored by santhosh's avatar santhosh
Browse files

Merge branch 'master' of http://git.novisync.com/santhosh/agile24x7-mobile-singledb

parents 18c8ea37 5e13db03
Hide whitespace changes
Inline Side-by-side
Showing
with 58 additions and 32 deletions
+58 -32
src/CommonComponents/EpicUserStory.js
View file @ 90efaeb8
......@@ -231,7 +231,7 @@ class ListItem extends React.Component {
<Text style={styles.signUpText0} >{TASKNO}:</Text>
<Text style={styles.signUpText1} >{item.story_id.substring(0, 5).toUpperCase()}</Text>
<Text style={styles.signUpText2}> {item.assignedDate}</Text>
<View style={{marginLeft:'10%'}}>
<View style={{marginLeft:'40%'}}>
{getMessagesCount( item.us_id,this.state.dataSource2,this.props.empId)}
</View>
</View>
......
src/CommonComponents/ReportBug.js
View file @ 90efaeb8
......@@ -349,7 +349,7 @@ export default class ReportBug extends Component {
<TouchableOpacity style={styles.opensave}
onPress={this.reportBug()} >
onPress={this.reportBug.bind(this)} >
<Text style={{ color: 'white' }}>Submit</Text>
</TouchableOpacity>
</View>
......@@ -392,11 +392,11 @@ const styles = StyleSheet.create({
flex: 1,
...Platform.select({
ios: {
backgroundColor: '#f1f0ef', margin: 20, height: 30, alignItems:
backgroundColor: 'orange', margin: 20, height: 30, alignItems:
"center", justifyContent: 'center'
},
android: {
backgroundColor: '#f1f0ef', margin: 20, height: 30, alignItems:
backgroundColor: 'orange', margin: 20, height: 30, alignItems:
"center", justifyContent: 'center'
},
}),
......
src/UserComponents/UserGroupChat.js
View file @ 90efaeb8
......@@ -350,7 +350,7 @@ class ListItem extends React.Component {
</View>
<Text style={{width:'60%',color:'grey'}}> {getLastMsg(this.state.dataSource2, item.id)}</Text>
<View style={{ justifyContent: 'flex-end',flexDirection: 'row' }}>
<View style={{ justifyContent: 'flex-end',flexDirection: 'row' ,marginTop:5}}>
{buttonDelete}
<View style={{ flexDirection: 'row', justifyContent: 'flex-end', alignItems: 'center' }}>
<TouchableOpacity style={{ padding: 5, backgroundColor: '#214274', marginLeft: 10, borderRadius: 10 }} onPress={() => this.props.exitGroup()}>
......@@ -1615,7 +1615,7 @@ export default class UserGroupChat extends Component {
/>
<TouchableOpacity onPress={this.openModal} style={styles.bottomView}>
<View style={styles.bottomView} >
<View >
<Text style={styles.textStyle}>Create Group</Text>
......@@ -1673,7 +1673,7 @@ export default class UserGroupChat extends Component {
// onItemSelect={(item) => this.setState({ assignedto: item.id })}
selectedItems={selectedItems}
styleItemsContainer={{ height: 150 }}
selectText="Select Employees"
selectText=" Select Employees"
searchInputPlaceholderText="Search Items..."
onChangeInput={(text) => console.log(text)}
// altFontFamily="ProximaNova-Light"
......
src/UserComponents/UserProfile.js
View file @ 90efaeb8
......@@ -11,7 +11,7 @@ import { widthPercentageToDP as wp, heightPercentageToDP as hp } from 'react-nat
import { TouchableOpacity } from 'react-native-gesture-handler';
// import Icon from 'react-native-vector-icons/FontAwesome';
import AsyncStorage from '@react-native-community/async-storage';
import { API,Client_URL } from "../WebServices/RestClient";
import { API, Client_URL } from "../WebServices/RestClient";
import NetInfo from '@react-native-community/netinfo';
import Snackbar from 'react-native-snackbar';
import ModalSelector from 'react-native-modal-selector';
......@@ -253,7 +253,7 @@ export default class UserProfile extends Component {
})
}).then((response) => response.json())
.then((responseJson) => {
//alert(JSON.stringify(responseJson));
alert(JSON.stringify(responseJson));
console.log(JSON.stringify(responseJson))
console.log(JSON.stringify("empInfo" + responseJson.data[0]))
db.addProfile(responseJson.data, cropcode).then((result) => {
......@@ -280,6 +280,8 @@ export default class UserProfile extends Component {
free_licenses: responseJson.free_licenses,
reportingManager: responseJson.data[0].reportingManager,
functionalManager: responseJson.data[0].functionalManager,
remaining_projects: responseJson.remaining_projects,
// free_licenses: responseJson.remaining_projects,
},
......@@ -405,9 +407,9 @@ export default class UserProfile extends Component {
if (responseJson.status === 'True') {
// this.refs.toast.showCenter('Epic Squad is Deactivated', Toast.Duration.long, Toast.Position.center);
console.log("done")
this.setState({ open: false })
}
else {
// alert("Hello111");
......@@ -835,7 +837,7 @@ export default class UserProfile extends Component {
})}
/> */}
<View style={{ flexDirection: 'row', }}>
<View style={{ paddingLeft: '2%', width: wp('32%') }}>
<View style={{ paddingLeft: '2%', width: wp('42%') }}>
<Text>{EMPLOYEEID}</Text>
</View>
......@@ -848,7 +850,7 @@ export default class UserProfile extends Component {
<View style={{ flexDirection: 'row', paddingTop: 10, }}>
<View style={{ paddingLeft: '2%', width: wp('32%') }}>
<View style={{ paddingLeft: '2%', width: wp('42%') }}>
<Text>{USERNAME}</Text>
</View>
......@@ -862,7 +864,7 @@ export default class UserProfile extends Component {
</View>
<View style={{ flexDirection: 'row', paddingTop: 10, }}>
<View style={{ paddingLeft: '2%', width: wp('32%') }}>
<View style={{ paddingLeft: '2%', width: wp('42%') }}>
<Text>{FULLNAME1}</Text>
</View>
......@@ -877,7 +879,7 @@ export default class UserProfile extends Component {
<View style={{ flexDirection: 'row', paddingTop: 10, }}>
<View style={{ paddingLeft: '2%', width: wp('32%') }}>
<View style={{ paddingLeft: '2%', width: wp('42%') }}>
<Text>{EMAIL}</Text>
</View>
......@@ -917,7 +919,7 @@ export default class UserProfile extends Component {
</View> */}
<View style={{ flexDirection: 'row', paddingTop: 10, }}>
<View style={{ paddingLeft: '2%', width: wp('32%'), }}>
<View style={{ paddingLeft: '2%', width: wp('42%'), }}>
<Text>{MOBILE}</Text>
</View>
......@@ -981,7 +983,7 @@ export default class UserProfile extends Component {
<View style={{ flexDirection: 'row', paddingTop: 10, }}>
<View style={{ paddingLeft: '2%', width: wp('32%') }}>
<View style={{ paddingLeft: '2%', width: wp('42%') }}>
<Text>{ROLE}</Text>
</View>
......@@ -994,7 +996,7 @@ export default class UserProfile extends Component {
</View>
<View style={{ flexDirection: 'row', paddingTop: 10 }}>
<View style={{ paddingLeft: '2%', width: wp('32%') }}>
<View style={{ paddingLeft: '2%', width: wp('42%') }}>
<Text>{STATUS1}</Text>
</View>
......@@ -1007,7 +1009,7 @@ export default class UserProfile extends Component {
</View>
<View style={{ flexDirection: 'row', paddingTop: 10 }}>
<View style={{ paddingLeft: '2%', width: wp('32%') }}>
<View style={{ paddingLeft: '2%', width: wp('42%') }}>
<Text>Working Hours</Text>
</View>
......@@ -1020,13 +1022,26 @@ export default class UserProfile extends Component {
</View>
<View style={{ flexDirection: 'row', paddingTop: 10 }}>
<View style={{ paddingLeft: '2%', width: wp('32%'),paddingTop:4 }}>
<View style={{ paddingLeft: '2%', width: wp('42%') }}>
<Text>Remaining Projects</Text>
</View>
<View>
<Text>{this.state.remaining_projects}</Text>
</View>
</View>
<View style={{ flexDirection: 'row', paddingTop: 10 }}>
<View style={{ paddingLeft: '2%', width: wp('42%'), paddingTop: 4 }}>
<Text>Account Status</Text>
</View>
<View>
{this.state.email_status === "1" ? <Text style={{color:'green'}}>Account Verified</Text> :
<TouchableOpacity style={{height:30}} onPress={this.accountVerify()} >
{this.state.email_status === "1" ? <Text style={{ color: 'green', paddingTop: 5 }}>Account Verified</Text> :
<TouchableOpacity style={{ height: 30, paddingTop: 5 }} onPress={this.accountVerify()} >
<Text style={styles.submit}>Verify</Text>
</TouchableOpacity>}
</View>
......
src/UserComponents/UserSupport.js
View file @ 90efaeb8
......@@ -100,6 +100,12 @@ export default class UserSupport extends Component {
if (responseJson.status === 'True') {
this.setState({
bug_one_sen: '',
steps_for_bug:''
});
this.props.navigation.navigate('MyTask');
}
......@@ -158,7 +164,7 @@ reportBug(){
},
}).then((response) => response.json())
.then((responseJson) => {
//alert(responseJson);
// alert(responseJson);
console.log(JSON.stringify(responseJson));
console.log(responseJson);
// alert("Your report was sent successfully")
......@@ -166,16 +172,21 @@ reportBug(){
if (responseJson.status === 'True') {
alert(responseJson.message);
this.setState({
bug_one_sen: '',
steps_for_bug:''
});
this.props.navigation.navigate('MyTask');
}
else {
console.log(JSON.stringify(responseJson));
log("Warn", "Error found");
// alert("error");
// alert(responseJson.message)
alert(responseJson.message)
}
}).catch((error) => {
......@@ -329,7 +340,7 @@ render() {
<TouchableOpacity style={styles.opensave}
onPress={this.reportBug()} >
onPress={this.reportBug.bind(this)} >
<Text style={{ color: 'white' }}>Submit</Text>
</TouchableOpacity>
</View>
......@@ -372,11 +383,11 @@ const styles = StyleSheet.create({
flex: 1,
...Platform.select({
ios: {
backgroundColor: '#f1f0ef', margin: 20, height: 30, alignItems:
backgroundColor: 'orange', margin: 20, height: 30, alignItems:
"center", justifyContent: 'center'
},
android: {
backgroundColor: '#f1f0ef', margin: 20, height: 30, alignItems:
backgroundColor: 'orange', margin: 20, height: 30, alignItems:
"center", justifyContent: 'center'
},
}),
......
src/WebServices/RestClient.js
View file @ 90efaeb8
......@@ -17,10 +17,10 @@
// //pre production environment (development)
// export const API = "https://api-single.agile24x7.com/pg_migration/";
// export const CHATAPI = "https://api-single.agile24x7.com/pg_migration";
// export const ReportsAPI = "https://pgtestreporting.agile24x7.com/";
// export const Client_URL = "https://pgtest.agile24x7.com/#/";
export const API = "https://api-single.agile24x7.com/pg_migration/";
export const CHATAPI = "https://api-single.agile24x7.com/pg_migration";
export const ReportsAPI = "https://pgtestreporting.agile24x7.com/";
export const Client_URL = "https://pgtest.agile24x7.com/#/";
//production environment
......
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 to comment