Merge pull request 'url issue fixed' (#11) from update-existing-code into development
Reviewed-on: WizdomWaves/TedQuMobileApp#11
This commit is contained in:
commit
03d0244031
|
@ -29,8 +29,7 @@ export const getMenuList = async ({token, academic_year, app_type}: any) => {
|
|||
method: 'GET',
|
||||
headers: { 'Content-Type': apiConfig.contentTypeJSON }
|
||||
}
|
||||
const url = `${Constants.easConfig.extra.LICENSE_BASE_URL + SCHOOL_LIST_API.GET_LICENSE_SCHOOLS}`
|
||||
|
||||
const url = `${Constants.easConfig.extra.LICENSE_BASE_URL + SCHOOL_LIST_API.GET_LICENSE_SCHOOLS}/`
|
||||
return fetchAPI(url, requestOptions)
|
||||
}
|
||||
|
||||
|
|
|
@ -111,7 +111,7 @@ export const getBlueprintDifficultyLevelDropdown = async ({token}: any) => {
|
|||
method: 'GET',
|
||||
headers: { 'Content-Type': apiConfig.contentTypeJSON, 'Authorization': token },
|
||||
}
|
||||
const url = `${QUESTION_BANK_API.GET_BLUEPRINT_DIFFICULTY_LEVEL_DROPDOWN}`
|
||||
const url = `${QUESTION_BANK_API.GET_BLUEPRINT_DIFFICULTY_LEVEL_DROPDOWN}/`
|
||||
return fetchAppBase(url, requestOptions)
|
||||
}
|
||||
|
||||
|
|
|
@ -336,7 +336,11 @@ class StudentProfile extends React.Component<any, any>{
|
|||
{classBasedTopic?.graph_data && classBasedTopic?.graph_data.map((topicItem: any, topicIndex: any) => (
|
||||
<TouchableOpacity key={topicIndex} style={[BaseStyles.marHorizontal5, BaseStyles.marVertical5]} activeOpacity={0.8}
|
||||
onPress={this.onTopicBasedResults.bind(this, topicItem, classBasedTopic)}>
|
||||
<Text style={[{ backgroundColor: topicItem?.color_code }, AppStyles.performanceTile,]}>{topicItem?.topics} {topicItem?.question_performance}%</Text>
|
||||
{/* <Text style={[{ backgroundColor: topicItem?.color_code }, AppStyles.performanceTile,]}>{topicItem?.topics} {topicItem?.question_performance}%</Text> */}
|
||||
<View style={[{ backgroundColor: topicItem?.color_code }, AppStyles.performanceTile,]}>
|
||||
<Text style={[{color: "white",textAlign:'center'}]} numberOfLines={3} ellipsizeMode="tail">{topicItem?.topics} </Text>
|
||||
<Text style={[{color: "white",textAlign:'center'}]}>{topicItem?.question_performance}%</Text>
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
))}
|
||||
</View>
|
||||
|
|
|
@ -188,7 +188,7 @@ class ClassCreate extends React.Component<any, any>{
|
|||
</TouchableOpacity>
|
||||
</View>
|
||||
<View style={styles.btnItem}>
|
||||
<TouchableOpacity style={[AppStyles.primaryBtn, { alignSelf: 'center' }]} disabled={!isValid || !dirty || this.props.loading}
|
||||
<TouchableOpacity style={[AppStyles.primaryBtn, { alignSelf: 'center' }, (!isValid || !dirty || this.props.loading) && AppStyles.primaryDisabledButton]} disabled={!isValid || !dirty || this.props.loading}
|
||||
onPress={handleSubmit} activeOpacity={0.8}>
|
||||
<Text style={AppStyles.btnText} >Add</Text>
|
||||
</TouchableOpacity>
|
||||
|
|
|
@ -404,7 +404,10 @@ export const AppStyles = StyleSheet.create({
|
|||
width: 80,
|
||||
height: 80,
|
||||
flexBasis: 80,
|
||||
flexGrow: 1
|
||||
flexGrow: 1,
|
||||
justifyContent: "space-between",
|
||||
alignItems: "center",
|
||||
flex:1
|
||||
},
|
||||
subjectLink:{padding:5,backgroundColor:"#8D81F8",color:"white",borderRadius:50},
|
||||
|
||||
|
|
Loading…
Reference in New Issue