Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ganesh committed Oct 24, 2016
1 parent a4cce29 commit 1662f8b
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 11 deletions.
13 changes: 13 additions & 0 deletions project_template/reviews/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,19 @@ def get_image(self, obj):
return str(obj.variant.image)

class CarVariantSerializer(serializers.ModelSerializer):
car_reviews = serializers.SerializerMethodField()
variant_name = serializers.SerializerMethodField()


class Meta:
model = CarVariant

def get_car_reviews(self, obj):
return_data = []
for reviews in obj.carvariantreview_set.all():
return_data.append(reviews.review)
return return_data

def get_variant_name(self, obj):
return "%s %s %s" %(obj.brand.name, obj.model.name, obj.name)

10 changes: 8 additions & 2 deletions project_template/reviews/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,16 @@ class CarVariantView(CarVariantMixin, generics.RetrieveUpdateDestroyAPIView):
class CarVariantsReviewView(generics.ListCreateAPIView):
permission_classes = (IsAuthenticatedOrReadOnly,)

queryset = CarVariantReview.objects.all()
serializer_class = CarVariantReviewSerializer


def get_queryset(self, *args, **kwargs):
# import ipdb; ipdb.set_trace()
try :
variant_id = self.request.GET['variant']
return CarVariantReview.objects.filter(variant=variant_id)
except :
return CarVariantReview.objects.all()

def perform_create(self, serializer):
user = self.request.user
serializer.save(review_by=user)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// ******************************
// Internal methods
// ******************************
carsService.getAllCars().then(function(response){
carsService.getAllVariants().then(function(response){
$scope.newCars = response.data;
}).catch(function() {
$scope.error = 'unable to get the cars';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@
</div>
</md-toolbar>
<md-dialog-content ms-scroll>
<img ng-if="vm.car.image" src="static/media/{{vm.car.image}}" width="100%">
<img ng-if="vm.car.image" src="{{vm.car.image}}" width="100%">
<img ng-if="carVariant.image" src="{{carVariant.image}}" width="100%">
<h4>Rating</h4>
<div ng-init="rating = star.rating + 1"></div>
<div class="star-rating" star-rating rating-value="rating" data-max="10" on-rating-selected="rateFunction(rating)"></div>
<h4>Review</h4>

<p>{{carReview.review}}</p>
<p>{{vm.car.review}}</p>
<div ng-repeat="review in carReview">
<p >{{review.review}}</p>
</div>
<p ng-repeat="review in vm.car.car_reviews">{{review}}</p>

<md-button type="submit" ng-click="vm.addReview()"
class="send-button md-accent md-raised"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ link : function(scope, elem, attrs) {
}


function addReview() {
function addReview() {
vm.showReview = true;
}

Expand Down
2 changes: 1 addition & 1 deletion project_template/staticfiles/src/myapps/cars/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ angular.module('carsservice', [])
getCarReview : function(variant){
return $http({
method : 'GET',
url : 'api/cars/review/'+ variant.id
url : 'api/cars/review/?variant='+ variant.id
})
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ <h3>Ratings and Reviews</h3>

<div class="row">
<div ng-click="vm.carReviewDialog($event, car)" class="col-md-4" ng-repeat="car in newCars">
<img src="static/media/{{car.image}}" width="100%">
<img src="{{car.image}}" width="100%">
<h3>{{car.variant_name}}</h3>
<p>{{car.review}}</p>
<p ng-repeat="review in car.car_reviews">{{review}}</p>
</div>
</div>
</div>
Expand Down

0 comments on commit 1662f8b

Please sign in to comment.